diff --git a/.github/test.sh b/.github/test.sh index 59d4820ecdd0..e69a77b29959 100755 --- a/.github/test.sh +++ b/.github/test.sh @@ -2,8 +2,8 @@ /usr/local/bin/cmake --version FACTOR=$1 set -ex -cd Polyhedron/demo -/usr/local/bin/cmake -S Polyhedron -B build -DCGAL_DIR=$2 +cd Lab/demo +/usr/local/bin/cmake -S Lab -B build -DCGAL_DIR=$2 LIST_OF_PLUGINS=$(/usr/local/bin/cmake --build build -t help | egrep 'plugin$' |& cut -d\ -f2) PLUGINS_ARRAY=(${LIST_OF_PLUGINS}); NB_OF_PLUGINS=${#PLUGINS_ARRAY[@]} diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index a98dfba56b83..51bffe93ef25 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -1,4 +1,4 @@ -name: Test Polyhedron Demo +name: Compile CGAL Lab on: [push, pull_request,workflow_dispatch] diff --git a/Installation/cmake/modules/list_of_whitelisted_headers.cmake b/Installation/cmake/modules/list_of_whitelisted_headers.cmake index 9cbef5d8a577..64fc508ffe16 100644 --- a/Installation/cmake/modules/list_of_whitelisted_headers.cmake +++ b/Installation/cmake/modules/list_of_whitelisted_headers.cmake @@ -11,9 +11,9 @@ set(list_of_whitelisted_headers_txt [=[ CGAL/Three/Edge_container.h CGAL/Three/exceptions.h CGAL/Three/Point_container.h - CGAL/Three/Polyhedron_demo_io_plugin_interface.h - CGAL/Three/Polyhedron_demo_plugin_helper.h - CGAL/Three/Polyhedron_demo_plugin_interface.h + CGAL/Three/CGAL_Lab_io_plugin_interface.h + CGAL/Three/CGAL_Lab_plugin_helper.h + CGAL/Three/CGAL_Lab_plugin_interface.h CGAL/Three/Primitive_container.h CGAL/Three/Scene_draw_interface.h CGAL/Three/Scene_group_item.h diff --git a/Polyhedron/demo/Polyhedron/C2t3_type.h b/Lab/demo/Lab/C2t3_type.h similarity index 100% rename from Polyhedron/demo/Polyhedron/C2t3_type.h rename to Lab/demo/Lab/C2t3_type.h diff --git a/Polyhedron/demo/Polyhedron/C3t3_type.h b/Lab/demo/Lab/C3t3_type.h similarity index 98% rename from Polyhedron/demo/Polyhedron/C3t3_type.h rename to Lab/demo/Lab/C3t3_type.h index fe8152643358..0231ccb89999 100644 --- a/Polyhedron/demo/Polyhedron/C3t3_type.h +++ b/Lab/demo/Lab/C3t3_type.h @@ -3,7 +3,7 @@ #include "config.h" #include "Plugins/Mesh_3/config_mesh_3.h" -// as otherwise it gets set via inclusion of Polyhedron_3.h +// as otherwise it gets set via inclusion of cgallab.h #include #include "SMesh_type.h" diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo.cpp b/Lab/demo/Lab/CGAL_Lab.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Polyhedron_demo.cpp rename to Lab/demo/Lab/CGAL_Lab.cpp index ce8046a360f1..72464ed4ddbb 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo.cpp +++ b/Lab/demo/Lab/CGAL_Lab.cpp @@ -1,4 +1,4 @@ -#include "Polyhedron_demo.h" +#include "cgallab.h" #include "MainWindow.h" #include #include @@ -11,12 +11,12 @@ #include -struct Polyhedron_demo_impl { +struct CGAL_Lab_impl { bool catch_exceptions; QScopedPointer mainWindow; - Polyhedron_demo_impl() : catch_exceptions(true) {} -}; // end struct Polyhedron_demo_impl + CGAL_Lab_impl() : catch_exceptions(true) {} +}; // end struct CGAL_Lab_impl int& code_to_call_before_creation_of_QCoreApplication(int& i) { QSurfaceFormat fmt; @@ -35,7 +35,7 @@ int& code_to_call_before_creation_of_QCoreApplication(int& i) { return i; } -Polyhedron_demo::Polyhedron_demo(int& argc, char **argv, +CGAL_Lab::CGAL_Lab(int& argc, char **argv, QString application_name, QString main_window_title, QStringList input_keywords) @@ -45,7 +45,7 @@ Polyhedron_demo::Polyhedron_demo(int& argc, char **argv, // object. argv) , d_ptr_is_initialized(false) - , d_ptr(new Polyhedron_demo_impl) + , d_ptr(new CGAL_Lab_impl) { //We set the locale to avoid any trouble with VTK std::setlocale(LC_ALL, "C"); @@ -129,7 +129,7 @@ Polyhedron_demo::Polyhedron_demo(int& argc, char **argv, } #endif - mainWindow.loadScript(":/cgal/Polyhedron_3/javascript/lib.js"); + mainWindow.loadScript(":/cgal/Lab/javascript/lib.js"); QFileInfo autostart_js("autostart.js"); if(!parser.isSet(no_autostart) && autostart_js.exists()) { mainWindow.loadScript(autostart_js); @@ -140,14 +140,14 @@ Polyhedron_demo::Polyhedron_demo(int& argc, char **argv, } -Polyhedron_demo::~Polyhedron_demo() {} +CGAL_Lab::~CGAL_Lab() {} -void Polyhedron_demo::do_not_catch_exceptions() { +void CGAL_Lab::do_not_catch_exceptions() { d_ptr->catch_exceptions = false; setProperty("no-try-catch", true); } -bool Polyhedron_demo::notify(QObject* receiver, QEvent* event) +bool CGAL_Lab::notify(QObject* receiver, QEvent* event) { if(!d_ptr_is_initialized || !d_ptr->catch_exceptions) return QApplication::notify(receiver, event); @@ -171,7 +171,7 @@ bool Polyhedron_demo::notify(QObject* receiver, QEvent* event) return false; } -int Polyhedron_demo::try_exec() +int CGAL_Lab::try_exec() { // A Qt Script may have closed the main window. // The following loop launch app.exec() only if the main window is visible. diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_detect_sharp_edges.h b/Lab/demo/Lab/CGAL_Lab_detect_sharp_edges.h similarity index 85% rename from Polyhedron/demo/Polyhedron/Polyhedron_demo_detect_sharp_edges.h rename to Lab/demo/Lab/CGAL_Lab_detect_sharp_edges.h index cd6cfb5e3c1a..e6ec2a219255 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_detect_sharp_edges.h +++ b/Lab/demo/Lab/CGAL_Lab_detect_sharp_edges.h @@ -1,6 +1,6 @@ -#ifndef POLYHEDRON_DEMO_DETECT_SHARP_EDGES_H -#define POLYHEDRON_DEMO_DETECT_SHARP_EDGES_H +#ifndef LAB_DEMO_DETECT_SHARP_EDGES_H +#define LAB_DEMO_DETECT_SHARP_EDGES_H #include @@ -29,4 +29,4 @@ namespace CGAL }//end namespace CGAL -#endif //POLYHEDRON_DEMO_DETECT_SHARP_EDGES_H +#endif //LAB_DEMO_DETECT_SHARP_EDGES_H diff --git a/Polyhedron/demo/Polyhedron/CGAL_double_edit.cpp b/Lab/demo/Lab/CGAL_double_edit.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/CGAL_double_edit.cpp rename to Lab/demo/Lab/CGAL_double_edit.cpp diff --git a/Polyhedron/demo/Polyhedron/CGAL_double_edit.h b/Lab/demo/Lab/CGAL_double_edit.h similarity index 100% rename from Polyhedron/demo/Polyhedron/CGAL_double_edit.h rename to Lab/demo/Lab/CGAL_double_edit.h diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Lab/demo/Lab/CMakeLists.txt similarity index 88% rename from Polyhedron/demo/Polyhedron/CMakeLists.txt rename to Lab/demo/Lab/CMakeLists.txt index 172b5bd63e91..f71fa87c647f 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Lab/demo/Lab/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1...3.23) -project(Polyhedron_Demo) +project(Lab_Demo) include(FeatureSummary) @@ -32,9 +32,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") include_directories(BEFORE ./ ./include ./CGAL_demo) list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}") -option(POLYHEDRON_QTSCRIPT_DEBUGGER - "Activate the use of Qt Script Debugger in Polyhedron_3 demo" OFF) - # Find CGAL find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6 ImageIO) set_package_properties(CGAL PROPERTIES TYPE REQUIRED) @@ -73,8 +70,8 @@ set_package_properties( PURPOSE "Required for the partition plugin.") # Activate concurrency? -option(POLYHEDRON_DEMO_ACTIVATE_CONCURRENCY "Enable concurrency" ON) -if(POLYHEDRON_DEMO_ACTIVATE_CONCURRENCY) +option(LAB_DEMO_ACTIVATE_CONCURRENCY "Enable concurrency" ON) +if(LAB_DEMO_ACTIVATE_CONCURRENCY) find_package(TBB QUIET) include(CGAL_TBB_support) if(NOT TARGET CGAL::TBB_support) @@ -130,9 +127,9 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) qt6_generate_moc("File_loader_dialog.h" "${CMAKE_CURRENT_BINARY_DIR}/File_loader_dialog_moc.cpp") - include(${CMAKE_CURRENT_SOURCE_DIR}/polyhedron_demo_macros.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cgallab_macros.cmake) - qt6_add_resources(CGAL_Qt6_RESOURCE_FILES Polyhedron_3.qrc) + qt6_add_resources(CGAL_Qt6_RESOURCE_FILES cgallab.qrc) find_path( CGAL_THREE_HEADERS_PATH NAMES CGAL/Three/Scene_item.h @@ -162,8 +159,8 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) # put plugins (which are shared libraries) at the same location as # executable files - set(CGAL_POLYHEDRON_DEMO_PLUGINS_DIR "${RUNTIME_OUTPUT_PATH}") - set(LIBRARY_OUTPUT_PATH "${CGAL_POLYHEDRON_DEMO_PLUGINS_DIR}") + set(CGAL_LAB_DEMO_PLUGINS_DIR "${RUNTIME_OUTPUT_PATH}") + set(LIBRARY_OUTPUT_PATH "${CGAL_LAB_DEMO_PLUGINS_DIR}") add_library( demo_framework SHARED @@ -187,7 +184,7 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) Scene_item_rendering_helper.cpp Scene_item_rendering_helper_moc.cpp Primitive_container.cpp - Polyhedron_demo_plugin_helper.cpp + cgallab_plugin_helper.cpp CGAL_double_edit.cpp) target_link_libraries(demo_framework PUBLIC Qt6::OpenGLWidgets Qt6::Widgets Qt6::Gui Qt6::Qml CGAL::CGAL_Qt6) @@ -350,9 +347,9 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) add_definitions(-DUSE_FORWARD_DECL) add_library( - polyhedron_demo SHARED + cgal_lab SHARED MainWindow.cpp - Polyhedron_demo.cpp + CGAL_Lab.cpp File_loader_dialog_moc.cpp Use_ssh.cpp ${CGAL_Qt6_RESOURCE_FILES} @@ -363,30 +360,30 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) ${statisticsUI_FILES} ${SubViewerUI_files}) target_link_libraries( - polyhedron_demo PUBLIC demo_framework point_dialog Qt6::Gui Qt6::OpenGLWidgets + cgal_lab PUBLIC demo_framework point_dialog Qt6::Gui Qt6::OpenGLWidgets Qt6::Widgets ) if(LIBSSH_FOUND) - target_compile_definitions(polyhedron_demo PRIVATE -DCGAL_USE_SSH) - target_link_libraries(polyhedron_demo PRIVATE ${LIBSSH_LIBRARIES}) - target_include_directories(polyhedron_demo SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIR}) + target_compile_definitions(cgal_lab PRIVATE -DCGAL_USE_SSH) + target_link_libraries(cgal_lab PRIVATE ${LIBSSH_LIBRARIES}) + target_include_directories(cgal_lab SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIR}) endif() #libssh if(TARGET Qt6::WebSockets) - target_compile_definitions(polyhedron_demo PRIVATE -DCGAL_USE_WEBSOCKETS) + target_compile_definitions(cgal_lab PRIVATE -DCGAL_USE_WEBSOCKETS) target_compile_definitions(demo_framework PRIVATE -DCGAL_USE_WEBSOCKETS) - target_link_libraries(polyhedron_demo PRIVATE Qt6::WebSockets) + target_link_libraries(cgal_lab PRIVATE Qt6::WebSockets) endif() - cgal_add_compilation_test(polyhedron_demo) - add_executable(Polyhedron_3 Polyhedron_3.cpp) - target_link_libraries(Polyhedron_3 PRIVATE polyhedron_demo) - add_to_cached_list(CGAL_EXECUTABLE_TARGETS Polyhedron_3) - cgal_add_compilation_test(Polyhedron_3) + cgal_add_compilation_test(cgal_lab) + add_executable(cgallab cgallab.cpp) + target_link_libraries(cgallab PRIVATE cgal_lab) + add_to_cached_list(CGAL_EXECUTABLE_TARGETS cgallab) + cgal_add_compilation_test(cgallab) - target_link_libraries(Polyhedron_3 PRIVATE demo_framework) + target_link_libraries(cgallab PRIVATE demo_framework) # Link with CGAL - target_link_libraries(Polyhedron_3 PUBLIC CGAL::CGAL_Qt6) + target_link_libraries(cgallab PUBLIC CGAL::CGAL_Qt6) - add_to_cached_list(CGAL_EXECUTABLE_TARGETS Polyhedron_3) + add_to_cached_list(CGAL_EXECUTABLE_TARGETS cgallab) ########### # PLUGINS # @@ -407,17 +404,17 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) # add_executable(CGAL_Mesh_3 Mesh_3.cpp) add_dependencies(CGAL_Mesh_3 Mesh_3) - target_link_libraries(CGAL_Mesh_3 PRIVATE polyhedron_demo) + target_link_libraries(CGAL_Mesh_3 PRIVATE cgal_lab) add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_Mesh_3) add_executable(CGAL_Classification Classification.cpp) add_dependencies(CGAL_Classification Classification) - target_link_libraries(CGAL_Classification PRIVATE polyhedron_demo) + target_link_libraries(CGAL_Classification PRIVATE cgal_lab) add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_Classification) add_executable(CGAL_PMP PMP.cpp) add_dependencies(CGAL_PMP PMP) - target_link_libraries(CGAL_PMP PRIVATE polyhedron_demo) + target_link_libraries(CGAL_PMP PRIVATE cgal_lab) add_to_cached_list(CGAL_EXECUTABLE_TARGETS CGAL_PMP) #WS Server @@ -432,14 +429,14 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) if(TARGET CGAL_Qt6) export( TARGETS CGAL CGAL_Qt6 CGAL_ImageIO - FILE polyhedron_demo_targets.cmake - NAMESPACE Polyhedron_) + FILE cgal_lab_targets.cmake + NAMESPACE Lab_) endif() if(TARGET CGAL_Qt6_moc_and_resources) export( TARGETS CGAL_Qt6_moc_and_resources - NAMESPACE Polyhedron_ APPEND - FILE polyhedron_demo_targets.cmake) + NAMESPACE Lab_ APPEND + FILE cgal_lab_targets.cmake) endif() export( TARGETS demo_framework @@ -452,26 +449,26 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) scene_selection_item scene_item_decorator scene_k_ring_selection - NAMESPACE Polyhedron_ APPEND - FILE polyhedron_demo_targets.cmake) + NAMESPACE Lab_ APPEND + FILE cgal_lab_targets.cmake) - configure_file(CGAL_polyhedron_demoConfig.cmake.in - CGAL_polyhedron_demoConfig.cmake) + configure_file(cgallabConfig.cmake.in + cgallabConfig.cmake) #TO DO script the activation of all the plugins. else(CGAL_Qt6_FOUND AND Qt6_FOUND) - set(POLYHEDRON_MISSING_DEPS "") + set(Lab_MISSING_DEPS "") if(NOT CGAL_Qt6_FOUND) - set(POLYHEDRON_MISSING_DEPS "the CGAL Qt6 library, ${POLYHEDRON_MISSING_DEPS}") + set(Lab_MISSING_DEPS "the CGAL Qt6 library, ${Lab_MISSING_DEPS}") endif() if(NOT Qt6_FOUND) - set(POLYHEDRON_MISSING_DEPS "Qt6, ${POLYHEDRON_MISSING_DEPS}") + set(Lab_MISSING_DEPS "Qt6, ${Lab_MISSING_DEPS}") endif() - message("NOTICE: XX This demo requires ${POLYHEDRON_MISSING_DEPS} and will not be compiled.") + message("NOTICE: XX This demo requires ${Lab_MISSING_DEPS} and will not be compiled.") endif(CGAL_Qt6_FOUND AND Qt6_FOUND) diff --git a/Polyhedron/demo/Polyhedron/Callback_signaler.cpp b/Lab/demo/Lab/Callback_signaler.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Callback_signaler.cpp rename to Lab/demo/Lab/Callback_signaler.cpp diff --git a/Polyhedron/demo/Polyhedron/Callback_signaler.h b/Lab/demo/Lab/Callback_signaler.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Callback_signaler.h rename to Lab/demo/Lab/Callback_signaler.h diff --git a/Polyhedron/demo/Polyhedron/Classification.cpp b/Lab/demo/Lab/Classification.cpp similarity index 86% rename from Polyhedron/demo/Polyhedron/Classification.cpp rename to Lab/demo/Lab/Classification.cpp index 525a1ca1cfcf..5f504652c4f8 100644 --- a/Polyhedron/demo/Polyhedron/Classification.cpp +++ b/Lab/demo/Lab/Classification.cpp @@ -1,4 +1,4 @@ -#include "Polyhedron_demo.h" +#include "cgallab.h" #include #include #include @@ -10,7 +10,7 @@ */ int main(int argc, char **argv) { - Polyhedron_demo app(argc, argv, + CGAL_Lab app(argc, argv, "Classification demo", "CGAL Classification Demo", QStringList() << "Classification"); diff --git a/Polyhedron/demo/Polyhedron/Color_map.h b/Lab/demo/Lab/Color_map.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Color_map.h rename to Lab/demo/Lab/Color_map.h diff --git a/Polyhedron/demo/Polyhedron/Color_ramp.cpp b/Lab/demo/Lab/Color_ramp.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Color_ramp.cpp rename to Lab/demo/Lab/Color_ramp.cpp diff --git a/Polyhedron/demo/Polyhedron/Color_ramp.h b/Lab/demo/Lab/Color_ramp.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Color_ramp.h rename to Lab/demo/Lab/Color_ramp.h diff --git a/Polyhedron/demo/Polyhedron/Details.ui b/Lab/demo/Lab/Details.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Details.ui rename to Lab/demo/Lab/Details.ui diff --git a/Polyhedron/demo/Polyhedron/Edge_container.cpp b/Lab/demo/Lab/Edge_container.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Edge_container.cpp rename to Lab/demo/Lab/Edge_container.cpp diff --git a/Polyhedron/demo/Polyhedron/FileLoaderDialog.ui b/Lab/demo/Lab/FileLoaderDialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/FileLoaderDialog.ui rename to Lab/demo/Lab/FileLoaderDialog.ui diff --git a/Polyhedron/demo/Polyhedron/File_loader_dialog.h b/Lab/demo/Lab/File_loader_dialog.h similarity index 100% rename from Polyhedron/demo/Polyhedron/File_loader_dialog.h rename to Lab/demo/Lab/File_loader_dialog.h diff --git a/Polyhedron/demo/Polyhedron/Image_type.h b/Lab/demo/Lab/Image_type.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Image_type.h rename to Lab/demo/Lab/Image_type.h diff --git a/Polyhedron/demo/Polyhedron/Image_type_fwd.h b/Lab/demo/Lab/Image_type_fwd.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Image_type_fwd.h rename to Lab/demo/Lab/Image_type_fwd.h diff --git a/Polyhedron/demo/Polyhedron/Kernel_type.h b/Lab/demo/Lab/Kernel_type.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Kernel_type.h rename to Lab/demo/Lab/Kernel_type.h diff --git a/Polyhedron/demo/Polyhedron/LightingDialog.ui b/Lab/demo/Lab/LightingDialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/LightingDialog.ui rename to Lab/demo/Lab/LightingDialog.ui diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Lab/demo/Lab/MainWindow.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/MainWindow.cpp rename to Lab/demo/Lab/MainWindow.cpp index f85d0355570a..2269b4a28398 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Lab/demo/Lab/MainWindow.cpp @@ -52,8 +52,8 @@ #include -#include -#include +#include +#include #include #include "ui_SubViewer.h" #include "ui_MainWindow.h" @@ -247,7 +247,7 @@ MainWindow::MainWindow(const QStringList &keywords, bool verbose, QWidget* paren // add the "About CGAL..." and "About demo..." entries this->addAboutCGAL(); - this->addAboutDemo(":/cgal/Polyhedron_3/about.html"); + this->addAboutDemo(":/cgal/Lab/about.html"); // Connect the button "addButton" with actionLoad ui->addButton->setDefaultAction(ui->actionLoad); @@ -662,7 +662,7 @@ void MainWindow::loadPlugins() } } } - QString env_path = qgetenv("POLYHEDRON_DEMO_PLUGINS_PATH"); + QString env_path = qgetenv("LAB_DEMO_PLUGINS_PATH"); #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) QChar separator = QDir::listSeparator(); #else @@ -734,8 +734,8 @@ bool MainWindow::hasPlugin(const QString& pluginName) const bool MainWindow::initPlugin(QObject* obj) { QObjectList childs = this->children(); - CGAL::Three::Polyhedron_demo_plugin_interface* plugin = - qobject_cast(obj); + CGAL::Three::CGAL_Lab_plugin_interface* plugin = + qobject_cast(obj); if(plugin) { // Call plugin's init() method obj->setParent(this); @@ -759,8 +759,8 @@ bool MainWindow::initPlugin(QObject* obj) bool MainWindow::initIOPlugin(QObject* obj) { - CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin = - qobject_cast(obj); + CGAL::Three::CGAL_Lab_io_plugin_interface* plugin = + qobject_cast(obj); if(plugin) { plugin->init(); io_plugins << plugin; @@ -973,7 +973,7 @@ void MainWindow::reloadItem() { continue; } - CGAL::Three::Polyhedron_demo_io_plugin_interface* fileloader = findLoader(loader_name); + CGAL::Three::CGAL_Lab_io_plugin_interface* fileloader = findLoader(loader_name); QFileInfo fileinfo(filename); bool ok; QList new_items = loadItem(fileinfo, fileloader, ok, false); @@ -1017,8 +1017,8 @@ void MainWindow::reloadItem() { } } -CGAL::Three::Polyhedron_demo_io_plugin_interface* MainWindow::findLoader(const QString& loader_name) const { - for(CGAL::Three::Polyhedron_demo_io_plugin_interface* io_plugin : +CGAL::Three::CGAL_Lab_io_plugin_interface* MainWindow::findLoader(const QString& loader_name) const { + for(CGAL::Three::CGAL_Lab_io_plugin_interface* io_plugin : io_plugins) { if(io_plugin->name() == loader_name) { return io_plugin; @@ -1103,7 +1103,7 @@ void MainWindow::open(QString filename) { // collect all io_plugins and offer them to load if the file extension match one name filter // also collect all available plugins in case of a no extension match - for(CGAL::Three::Polyhedron_demo_io_plugin_interface* io_plugin : io_plugins) { + for(CGAL::Three::CGAL_Lab_io_plugin_interface* io_plugin : io_plugins) { if ( file_matches_filter(io_plugin->loadNameFilters(), filename.toLower()) ) { if ( !io_plugin->canLoad(fileinfo) ) continue; @@ -1115,7 +1115,7 @@ void MainWindow::open(QString filename) } } //if no plugin is correct, offer them all. - for(CGAL::Three::Polyhedron_demo_io_plugin_interface* io_plugin : io_plugins) { + for(CGAL::Three::CGAL_Lab_io_plugin_interface* io_plugin : io_plugins) { all_items << io_plugin->name(); } } @@ -1183,7 +1183,7 @@ bool MainWindow::open(QString filename, QString loader_name) { QList MainWindow::loadItem(QFileInfo fileinfo, - CGAL::Three::Polyhedron_demo_io_plugin_interface* loader, + CGAL::Three::CGAL_Lab_io_plugin_interface* loader, bool &ok, bool add_to_scene) { if(!fileinfo.isFile() || !fileinfo.isReadable()) { @@ -1834,10 +1834,10 @@ void MainWindow::on_actionLoad_triggered() filters << "All Files (*)"; - typedef QMap FilterPluginMap; + typedef QMap FilterPluginMap; FilterPluginMap filterPluginMap; - for(CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin : io_plugins) { + for(CGAL::Three::CGAL_Lab_io_plugin_interface* plugin : io_plugins) { QStringList split_filters = plugin->loadNameFilters().split(";;"); for(const QString& filter : split_filters) { FilterPluginMap::iterator it = filterPluginMap.find(filter); @@ -1868,7 +1868,7 @@ void MainWindow::on_actionLoad_triggered() FilterPluginMap::iterator it = filterPluginMap.find(dialog.selectedNameFilter()); - CGAL::Three::Polyhedron_demo_io_plugin_interface* selectedPlugin = nullptr; + CGAL::Three::CGAL_Lab_io_plugin_interface* selectedPlugin = nullptr; if(it != filterPluginMap.end()) { selectedPlugin = it.value(); @@ -1927,10 +1927,10 @@ void MainWindow::on_actionSaveAs_triggered() while(!to_save.empty()) { Scene_item* item = to_save.front(); - QVector canSavePlugins; + QVector canSavePlugins; QStringList filters; QString sf; - for(CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin : io_plugins) { + for(CGAL::Three::CGAL_Lab_io_plugin_interface* plugin : io_plugins) { if(plugin->canSave(item)) { canSavePlugins << plugin; filters += plugin->saveNameFilters(); @@ -2046,7 +2046,7 @@ void MainWindow::on_actionSaveAs_triggered() void MainWindow::save(QString filename, QList& to_save) { QFileInfo fileinfo(filename); bool saved = false; - for(CGAL::Three::Polyhedron_demo_io_plugin_interface* plugin : io_plugins) { + for(CGAL::Three::CGAL_Lab_io_plugin_interface* plugin : io_plugins) { if( plugin->canSave(to_save.front()) && file_matches_filter(plugin->saveNameFilters(),filename.toLower()) ) { @@ -2879,14 +2879,14 @@ void MainWindow::on_actionSa_ve_Scene_as_Script_triggered() std::vector colors; std::vector rendering_modes; QStringList not_saved; - Polyhedron_demo_io_plugin_interface* camera_plugin = nullptr; + CGAL_Lab_io_plugin_interface* camera_plugin = nullptr; QMap > group_children_map; for(int i = 0; i < scene->numberOfEntries(); ++i) { Scene_item* item = scene->item(i); QString loader;// = item->property("loader_name").toString(); QString ext; - for(Polyhedron_demo_io_plugin_interface* iop : io_plugins) + for(CGAL_Lab_io_plugin_interface* iop : io_plugins) { if(iop->name() == "camera_positions_plugin") camera_plugin = iop; @@ -3087,8 +3087,8 @@ void MainWindow::on_actionSa_ve_Scene_as_Script_triggered() tr("Enter the name of your scene file.")); if(path.isEmpty()) return; - if(!path.contains("/tmp/Polyhedron_demo_")) - path.prepend("/tmp/Polyhedron_demo_"); + if(!path.contains("/tmp/CGAL_Lab_")) + path.prepend("/tmp/CGAL_Lab_"); try{ ssh_session session = nullptr; bool res = establish_ssh_session_from_agent(session, @@ -3608,7 +3608,7 @@ void MainWindow::test_all_actions() selectSceneItem(0); for(PluginNamePair pnp : plugins) { - Polyhedron_demo_plugin_interface* plugin = pnp.first; + CGAL_Lab_plugin_interface* plugin = pnp.first; for(QAction* action : plugin->actions()){ if(plugin->applicable(action)){ qDebug()<<"Testing "<text()<<" on"; @@ -3724,7 +3724,7 @@ void MainWindow::on_actionLoad_a_Scene_from_a_Script_File_triggered() ssh_free(session); return; } - path.prepend("Polyhedron_demo_"); + path.prepend("CGAL_Lab_"); path = tr("/tmp/%2").arg(path); res = pull_file(session,path.toStdString().c_str(), filename.toStdString().c_str()); if(!res) diff --git a/Polyhedron/demo/Polyhedron/MainWindow.h b/Lab/demo/Lab/MainWindow.h similarity index 97% rename from Polyhedron/demo/Polyhedron/MainWindow.h rename to Lab/demo/Lab/MainWindow.h index e3100ad783fd..da5a4cb6a2f4 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.h +++ b/Lab/demo/Lab/MainWindow.h @@ -33,8 +33,8 @@ class QMenu; class QWidgetAction; namespace CGAL { namespace Three{ -class Polyhedron_demo_io_plugin_interface; -class Polyhedron_demo_plugin_interface; +class CGAL_Lab_io_plugin_interface; +class CGAL_Lab_plugin_interface; class Scene_item; class Viewer_interface; } @@ -88,14 +88,14 @@ class MAINWINDOW_EXPORT MainWindow : /*! Finds an I/O plugin. * throws std::invalid_argument if no loader with that argument can be found @returns the I/O plugin associated with `loader_name`*/ - CGAL::Three::Polyhedron_demo_io_plugin_interface* findLoader(const QString& loader_name) const; + CGAL::Three::CGAL_Lab_io_plugin_interface* findLoader(const QString& loader_name) const; /*! \brief loads on or more item with a given loader. * * throws `std::logic_error` if loading does not succeed or * `std::invalid_argument` if `fileinfo` specifies an invalid file*/ QList loadItem(QFileInfo fileinfo, - CGAL::Three::Polyhedron_demo_io_plugin_interface*, + CGAL::Three::CGAL_Lab_io_plugin_interface*, bool& ok, bool add_to_scene=true); @@ -418,11 +418,11 @@ protected Q_SLOTS: QSortFilterProxyModel* proxyModel; QTreeView* sceneView; Ui::MainWindow* ui; - QVector io_plugins; + QVector io_plugins; QString last_saved_dir; QMap default_plugin_selection; // typedef to make Q_FOREACH work - typedef QPair PluginNamePair; + typedef QPair PluginNamePair; QVector plugins; //!Called when "Add new group" in the file menu is triggered. QAction* actionAddToGroup; diff --git a/Polyhedron/demo/Polyhedron/MainWindow.ui b/Lab/demo/Lab/MainWindow.ui similarity index 96% rename from Polyhedron/demo/Polyhedron/MainWindow.ui rename to Lab/demo/Lab/MainWindow.ui index a56c2c1afe8e..32ad15dda370 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.ui +++ b/Lab/demo/Lab/MainWindow.ui @@ -14,7 +14,7 @@ CGAL Three - + :/cgal/icons/resources/cgal_logo.xpm:/cgal/icons/resources/cgal_logo.xpm @@ -132,7 +132,7 @@ + - + :/cgal/icons/plus:/cgal/icons/plus @@ -143,7 +143,7 @@ - - + :/cgal/icons/minus:/cgal/icons/minus @@ -154,7 +154,7 @@ ... - + :/cgal/icons/duplicate:/cgal/icons/duplicate @@ -165,7 +165,7 @@ ... - + :/cgal/icons/resources/up.png:/cgal/icons/resources/up.png @@ -176,7 +176,7 @@ ... - + :/cgal/icons/resources/down.png:/cgal/icons/resources/down.png @@ -344,7 +344,7 @@ - + :/cgal/icons/plus:/cgal/icons/plus @@ -356,7 +356,7 @@ - + :/cgal/icons/minus:/cgal/icons/minus @@ -368,7 +368,7 @@ - + :/cgal/icons/duplicate:/cgal/icons/duplicate @@ -471,8 +471,8 @@ - - + + diff --git a/Polyhedron/demo/Polyhedron/MainWindow_config.h b/Lab/demo/Lab/MainWindow_config.h similarity index 89% rename from Polyhedron/demo/Polyhedron/MainWindow_config.h rename to Lab/demo/Lab/MainWindow_config.h index 7c43749e79af..833bd9c1c671 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow_config.h +++ b/Lab/demo/Lab/MainWindow_config.h @@ -3,7 +3,7 @@ #include -#ifdef polyhedron_demo_EXPORTS +#ifdef cgal_lab_EXPORTS # define mainwindow_EXPORTS #endif diff --git a/Polyhedron/demo/Polyhedron/Mainpage.md b/Lab/demo/Lab/Mainpage.md similarity index 83% rename from Polyhedron/demo/Polyhedron/Mainpage.md rename to Lab/demo/Lab/Mainpage.md index 444a5ee8b984..516b8a0606df 100644 --- a/Polyhedron/demo/Polyhedron/Mainpage.md +++ b/Lab/demo/Lab/Mainpage.md @@ -1,9 +1,9 @@ Main Page {#mainpage} ============ -These pages are not documenting the whole Polyhedron demo but only the API that can be useful to create and add a new plugin. +These pages are not documenting the whole Lab but only the API that can be useful to create and add a new plugin. -Understanding the Polyhedron demo +Understanding the Lab ============ There are several levels in this demo. @@ -18,19 +18,19 @@ A plugin usually defines an object that inherits from Scene_item or uses some of Creating a simple Plugin ============ -A basic plugin will inherit from Polyhedron_demo_plugin_interface. It can also inherits from the Polyhedron_demo_plugin_helper instead, for a more detailed model of plugin. -Its name must be of the form Polyhedron_demo_xxxx_yyyy_plugin. \n +A basic plugin will inherit from CGAL_Lab_plugin_interface. It can also inherits from the CGAL_Lab_plugin_helper instead, for a more detailed model of plugin. +Its name must be of the form CGAL_Lab_xxxx_yyyy_plugin. \n In the CMakeList.txt file, in the section Plugins, add the following lines : - polyhedron_demo_plugin(xxxx_yyyy_plugin Polyhedron_demo_xxxx_yyyy_plugin) + cgal_lab_plugin(xxxx_yyyy_plugin CGAL_Lab_xxxx_yyyy_plugin) target_link_libraries(xxxx_yyyy_plugin scene_polyhedron_item) - [init]: @ref Polyhedron_demo_plugin_helper#init(QMainWindow *, Scene_interface *) + [init]: @ref CGAL_Lab_plugin_helper#init(QMainWindow *, Scene_interface *) The class must contain the following lines :\n Q_OBJECT\n - Q_INTERFACES(Polyhedron_demo_plugin_interface)\n - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0")\n + Q_INTERFACES(CGAL_Lab_plugin_interface)\n + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0")\n In the function [init], get a reference to the Scene and to the MainWindow. Then, create and link the actions of the plugin.\n Create a list of QActions containing the actions of the plugin.\n @@ -43,7 +43,7 @@ If the plugin implements a new Scene_item, please notice that a Scene_itam have A plugin must always contain ~~~~~~~~~~~~~{.cpp} -#include "Polyhedron_demo_xxxx_yyyy_plugin.moc" +#include "CGAL_Lab_xxxx_yyyy_plugin.moc" ~~~~~~~~~~~~~ List of useful classes : @@ -52,8 +52,8 @@ List of useful classes : - Viewer_interface - Scene_interface - Scene_item -- Polyhedron_demo_plugin_helper -- Polyhedron_demo_plugin_interface +- CGAL_Lab_plugin_helper +- CGAL_Lab_plugin_interface Example : @@ -184,21 +184,21 @@ private: }; //end of class Scene_triangle_item -#include -class Polyhedron_demo_example_plugin : +#include +class CGAL_Lab_example_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { //Configures CMake to use MOC correctly Q_OBJECT - Q_INTERFACES(Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public : // To silent a warning -Woverloaded-virtual // See https://stackoverflow.com/questions/9995421/gcc-woverloaded-virtual-warnings - using Polyhedron_demo_plugin_helper::init; + using CGAL_Lab_plugin_helper::init; void init(QMainWindow* mainWindow, Scene_interface* scene_interface) { @@ -233,8 +233,8 @@ private: Scene_item* triangle; QAction* actionDrawTriangle; -}; //end of class Polyhedron_demo_example_plugin +}; //end of class CGAL_Lab_example_plugin -#include "Polyhedron_demo_example_plugin.moc" +#include "CGAL_Lab_example_plugin.moc" ~~~~~~~~~~~~~ diff --git a/Polyhedron/demo/Polyhedron/Mesh_3.cpp b/Lab/demo/Lab/Mesh_3.cpp similarity index 85% rename from Polyhedron/demo/Polyhedron/Mesh_3.cpp rename to Lab/demo/Lab/Mesh_3.cpp index 611139956e1f..6840b8fffab7 100644 --- a/Polyhedron/demo/Polyhedron/Mesh_3.cpp +++ b/Lab/demo/Lab/Mesh_3.cpp @@ -1,4 +1,4 @@ -#include "Polyhedron_demo.h" +#include "cgallab.h" #include #include #include @@ -10,7 +10,7 @@ */ int main(int argc, char **argv) { - Polyhedron_demo app(argc, argv, + CGAL_Lab app(argc, argv, "Mesh_3 demo", "CGAL Mesh_3 Demo", QStringList() << "Mesh_3"); diff --git a/Polyhedron/demo/Polyhedron/Messages_interface.h b/Lab/demo/Lab/Messages_interface.h similarity index 82% rename from Polyhedron/demo/Polyhedron/Messages_interface.h rename to Lab/demo/Lab/Messages_interface.h index 5a8ec1845561..70565a38b4db 100644 --- a/Polyhedron/demo/Polyhedron/Messages_interface.h +++ b/Lab/demo/Lab/Messages_interface.h @@ -13,6 +13,6 @@ class Messages_interface { }; Q_DECLARE_INTERFACE(Messages_interface, - "com.geometryfactory.PolyhedronDemo.MessagesInterface/1.0") + "com.geometryfactory.CGALLab.MessagesInterface/1.0") #endif // MESSAGES_INTERFACE_H diff --git a/Polyhedron/demo/Polyhedron/Nef_type.h b/Lab/demo/Lab/Nef_type.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Nef_type.h rename to Lab/demo/Lab/Nef_type.h diff --git a/Polyhedron/demo/Polyhedron/Nef_type_fwd.h b/Lab/demo/Lab/Nef_type_fwd.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Nef_type_fwd.h rename to Lab/demo/Lab/Nef_type_fwd.h diff --git a/Polyhedron/demo/Polyhedron/One_ring_iterators.h b/Lab/demo/Lab/One_ring_iterators.h similarity index 100% rename from Polyhedron/demo/Polyhedron/One_ring_iterators.h rename to Lab/demo/Lab/One_ring_iterators.h diff --git a/Polyhedron/demo/Polyhedron/PMP.cpp b/Lab/demo/Lab/PMP.cpp similarity index 91% rename from Polyhedron/demo/Polyhedron/PMP.cpp rename to Lab/demo/Lab/PMP.cpp index 3b3b4509f6e1..a0f53d4ce6b8 100644 --- a/Polyhedron/demo/Polyhedron/PMP.cpp +++ b/Lab/demo/Lab/PMP.cpp @@ -1,4 +1,4 @@ -#include "Polyhedron_demo.h" +#include "cgallab.h" #include #include #include @@ -19,7 +19,7 @@ int main(int argc, char **argv) QSurfaceFormat::setDefaultFormat(fmt); QStringList keywords; keywords << "PMP"; - Polyhedron_demo app(argc, argv, + CGAL_Lab app(argc, argv, "PMP demo", "CGAL Polygon Mesh Processing Demo", keywords); diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/CMakeLists.txt b/Lab/demo/Lab/Plugins/AABB_tree/CMakeLists.txt similarity index 72% rename from Polyhedron/demo/Polyhedron/Plugins/AABB_tree/CMakeLists.txt rename to Lab/demo/Lab/Plugins/AABB_tree/CMakeLists.txt index 452504968c99..7f941111d243 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/AABB_tree/CMakeLists.txt @@ -1,10 +1,10 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) -polyhedron_demo_plugin(do_trees_intersect_plugin Do_trees_intersect_plugin) +cgal_lab_plugin(do_trees_intersect_plugin Do_trees_intersect_plugin) target_link_libraries(do_trees_intersect_plugin PUBLIC scene_surface_mesh_item scene_movable_sm_item) -polyhedron_demo_plugin(cut_plugin Cut_plugin) +cgal_lab_plugin(cut_plugin Cut_plugin) target_link_libraries(cut_plugin PUBLIC scene_surface_mesh_item scene_basic_objects scene_color_ramp) if(TARGET CGAL::TBB_support) diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp b/Lab/demo/Lab/Plugins/AABB_tree/Cut_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp rename to Lab/demo/Lab/Plugins/AABB_tree/Cut_plugin.cpp index 9c6105b5db7c..c5d3dda9825e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp +++ b/Lab/demo/Lab/Plugins/AABB_tree/Cut_plugin.cpp @@ -8,8 +8,8 @@ #include "Messages_interface.h" #include "Scene_plane_item.h" #include "Scene_surface_mesh_item.h" -#include -#include +#include +#include #include #include #include @@ -923,22 +923,22 @@ class Q_DECL_EXPORT Scene_edges_item : public CGAL::Three::Scene_item_rendering_ }; // end class Scene_edges_item using namespace CGAL::Three; -class Polyhedron_demo_cut_plugin : +class CGAL_Lab_cut_plugin : public QObject, - public Polyhedron_demo_plugin_interface, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_plugin_interface, + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90") public: - Polyhedron_demo_cut_plugin() : QObject(), edges_item(nullptr) { + CGAL_Lab_cut_plugin() : QObject(), edges_item(nullptr) { } - ~Polyhedron_demo_cut_plugin(); + ~CGAL_Lab_cut_plugin(); bool applicable(QAction*) const override{ // returns true if one surface_mesh is in the entries @@ -1007,7 +1007,7 @@ class Polyhedron_demo_cut_plugin : return false; } - using Polyhedron_demo_io_plugin_interface::init; + using CGAL_Lab_io_plugin_interface::init; void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) override; QList actions() const override; @@ -1124,10 +1124,10 @@ public Q_SLOTS: Edge_sm_trees edge_sm_trees; template void apply(Item* item, QMap< QObject*, Facets_tree*>& f_trees, QMap& e_trees); -}; // end Polyhedron_demo_cut_plugin +}; // end CGAL_Lab_cut_plugin -Polyhedron_demo_cut_plugin::~Polyhedron_demo_cut_plugin() +CGAL_Lab_cut_plugin::~CGAL_Lab_cut_plugin() { for(Facet_sm_tree *tree : facet_sm_trees.values()) { @@ -1140,7 +1140,7 @@ Polyhedron_demo_cut_plugin::~Polyhedron_demo_cut_plugin() } -void Polyhedron_demo_cut_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_cut_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { @@ -1190,11 +1190,11 @@ void Polyhedron_demo_cut_plugin::init(QMainWindow* mainWindow, } -QList Polyhedron_demo_cut_plugin::actions() const { +QList CGAL_Lab_cut_plugin::actions() const { return _actions; } -void Polyhedron_demo_cut_plugin::updateTrees(int id) +void CGAL_Lab_cut_plugin::updateTrees(int id) { if(plane_item && qobject_cast(scene->item(id))) @@ -1202,7 +1202,7 @@ if(plane_item && } template -void Polyhedron_demo_cut_plugin::apply(Item* item, QMap< QObject*, Facets_tree*>& f_trees, QMap& e_trees) +void CGAL_Lab_cut_plugin::apply(Item* item, QMap< QObject*, Facets_tree*>& f_trees, QMap& e_trees) { const Mesh& mesh = *item->polyhedron(); if(!CGAL::is_triangle_mesh(mesh)) @@ -1252,7 +1252,7 @@ void Polyhedron_demo_cut_plugin::apply(Item* item, QMap< QObject*, Facets_tree*> } } -void Polyhedron_demo_cut_plugin::createCutPlane() { +void CGAL_Lab_cut_plugin::createCutPlane() { bool updating = false; Scene_aabb_plane_item::Cut_planes_types type; int plane_id = -1; @@ -1313,7 +1313,7 @@ void Polyhedron_demo_cut_plugin::createCutPlane() { cut(); } -void Polyhedron_demo_cut_plugin::Intersection() +void CGAL_Lab_cut_plugin::Intersection() { QApplication::setOverrideCursor(Qt::WaitCursor); if(!plane_item) @@ -1325,7 +1325,7 @@ void Polyhedron_demo_cut_plugin::Intersection() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_cut_plugin::SignedFacets() { +void CGAL_Lab_cut_plugin::SignedFacets() { QApplication::setOverrideCursor(Qt::WaitCursor); if(!plane_item) createCutPlane(); @@ -1340,7 +1340,7 @@ void Polyhedron_demo_cut_plugin::SignedFacets() { QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_cut_plugin::UnsignedFacets() { +void CGAL_Lab_cut_plugin::UnsignedFacets() { QApplication::setOverrideCursor(Qt::WaitCursor); if(!plane_item) createCutPlane(); @@ -1354,7 +1354,7 @@ void Polyhedron_demo_cut_plugin::UnsignedFacets() { } QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_cut_plugin::UnsignedEdges() { +void CGAL_Lab_cut_plugin::UnsignedEdges() { QApplication::setOverrideCursor(Qt::WaitCursor); if(!plane_item) createCutPlane(); @@ -1369,7 +1369,7 @@ void Polyhedron_demo_cut_plugin::UnsignedEdges() { QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_cut_plugin::computeIntersection() +void CGAL_Lab_cut_plugin::computeIntersection() { QApplication::setOverrideCursor(Qt::WaitCursor); if(!edges_item) { @@ -1417,7 +1417,7 @@ void Polyhedron_demo_cut_plugin::computeIntersection() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_cut_plugin::cut() +void CGAL_Lab_cut_plugin::cut() { if(!plane_item) return; diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp b/Lab/demo/Lab/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp rename to Lab/demo/Lab/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp index 96741cfd9f04..ae68ee331877 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp +++ b/Lab/demo/Lab/Plugins/AABB_tree/Do_trees_intersect_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -18,11 +18,11 @@ class DoTreesIntersectplugin: public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: bool eventFilter(QObject *, QEvent *event) override diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Scene_movable_sm_item.cpp b/Lab/demo/Lab/Plugins/AABB_tree/Scene_movable_sm_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Scene_movable_sm_item.cpp rename to Lab/demo/Lab/Plugins/AABB_tree/Scene_movable_sm_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Scene_movable_sm_item.h b/Lab/demo/Lab/Plugins/AABB_tree/Scene_movable_sm_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Scene_movable_sm_item.h rename to Lab/demo/Lab/Plugins/AABB_tree/Scene_movable_sm_item.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/Alpha_wrap_3_plugin.cpp b/Lab/demo/Lab/Plugins/Alpha_wrap_3/Alpha_wrap_3_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/Alpha_wrap_3_plugin.cpp rename to Lab/demo/Lab/Plugins/Alpha_wrap_3/Alpha_wrap_3_plugin.cpp index 91390c759ddb..0ab0d872c887 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/Alpha_wrap_3_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Alpha_wrap_3/Alpha_wrap_3_plugin.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include "Scene_surface_mesh_item.h" #include "Scene_polygon_soup_item.h" @@ -293,13 +293,13 @@ public Q_SLOTS: void status_report(QString); }; -class Polyhedron_demo_alpha_wrap_3_plugin +class CGAL_Lab_alpha_wrap_3_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_helper + public CGAL::Three::CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") using Triangles = std::vector; using Segments = std::vector; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/CMakeLists.txt b/Lab/demo/Lab/Plugins/Alpha_wrap_3/CMakeLists.txt similarity index 72% rename from Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Alpha_wrap_3/CMakeLists.txt index 3f6540236e37..f77202905c66 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Alpha_wrap_3/CMakeLists.txt @@ -1,8 +1,8 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) #if the plugin has a UI file qt6_wrap_ui(alpha_wrap_3UI_FILES alpha_wrap_3_dialog.ui) -polyhedron_demo_plugin(alpha_wrap_3_plugin Alpha_wrap_3_plugin ${alpha_wrap_3UI_FILES}) +cgal_lab_plugin(alpha_wrap_3_plugin Alpha_wrap_3_plugin ${alpha_wrap_3UI_FILES}) #if the plugin uses external libraries like scene_items target_link_libraries(alpha_wrap_3_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item scene_points_with_normal_item scene_selection_item scene_polylines_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/alpha_wrap_3_dialog.ui b/Lab/demo/Lab/Plugins/Alpha_wrap_3/alpha_wrap_3_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Alpha_wrap_3/alpha_wrap_3_dialog.ui rename to Lab/demo/Lab/Plugins/Alpha_wrap_3/alpha_wrap_3_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/CMakeLists.txt b/Lab/demo/Lab/Plugins/Camera_position/CMakeLists.txt similarity index 77% rename from Polyhedron/demo/Polyhedron/Plugins/Camera_position/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Camera_position/CMakeLists.txt index e080e6837a31..c06fbc2f6302 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Camera_position/CMakeLists.txt @@ -1,7 +1,7 @@ -include( polyhedron_demo_macros ) +include( cgallab_macros ) qt6_wrap_ui( cameraUI_FILES Camera_positions_list.ui ) -polyhedron_demo_plugin(camera_positions_plugin +cgal_lab_plugin(camera_positions_plugin Camera_positions_plugin Camera_positions_list.cpp ${cameraUI_FILES} diff --git a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.cpp b/Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.cpp rename to Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.h b/Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.h rename to Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.ui b/Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.ui similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.ui rename to Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.ui index d1b910addf48..170a92300f90 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_list.ui +++ b/Lab/demo/Lab/Plugins/Camera_position/Camera_positions_list.ui @@ -43,7 +43,7 @@ ... - + :/cgal/icons/plus:/cgal/icons/plus @@ -54,7 +54,7 @@ ... - + :/cgal/icons/minus:/cgal/icons/minus @@ -72,7 +72,7 @@ &Up - + :/cgal/icons/resources/up.png:/cgal/icons/resources/up.png @@ -86,7 +86,7 @@ &Down - + :/cgal/icons/resources/down.png:/cgal/icons/resources/down.png @@ -120,7 +120,7 @@ PushButton - + :/cgal/icons/resources/front.png:/cgal/icons/resources/front.png @@ -134,7 +134,7 @@ PushButton - + :/cgal/icons/resources/back.png:/cgal/icons/resources/back.png @@ -148,7 +148,7 @@ PushButton - + :/cgal/icons/resources/top.png:/cgal/icons/resources/top.png @@ -162,7 +162,7 @@ PushButton - + :/cgal/icons/resources/bot.png:/cgal/icons/resources/bot.png @@ -176,7 +176,7 @@ PushButton - + :/cgal/icons/resources/left.png:/cgal/icons/resources/left.png @@ -190,7 +190,7 @@ PushButton - + :/cgal/icons/resources/right.png:/cgal/icons/resources/right.png @@ -217,7 +217,7 @@ - + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp b/Lab/demo/Lab/Plugins/Camera_position/Camera_positions_plugin.cpp similarity index 75% rename from Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp rename to Lab/demo/Lab/Plugins/Camera_position/Camera_positions_plugin.cpp index 53104cf72560..3a342fcf2460 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Camera_position/Camera_positions_plugin.cpp @@ -1,6 +1,6 @@ #include #include "Messages_interface.h" -#include +#include #include "Camera_positions_list.h" @@ -9,13 +9,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_camera_positions_plugin : +class CGAL_Lab_camera_positions_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90") public: void init() override; @@ -40,7 +40,7 @@ class Polyhedron_demo_camera_positions_plugin : Camera_positions_list* cpl; }; -void Polyhedron_demo_camera_positions_plugin::init() +void CGAL_Lab_camera_positions_plugin::init() { cpl = new Camera_positions_list(CGAL::Three::Three::mainWindow()); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt b/Lab/demo/Lab/Plugins/Classification/CMakeLists.txt similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Classification/CMakeLists.txt index dffeae9f7133..26c5f32631f0 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Classification/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) if(TARGET CGAL::Eigen3_support) @@ -22,7 +22,7 @@ if(TARGET CGAL::Eigen3_support) qt6_wrap_ui(classificationUI_FILES Classification_widget.ui Classification_advanced_widget.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( classification_plugin Classification_plugin Point_set_item_classification.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_advanced_widget.ui b/Lab/demo/Lab/Plugins/Classification/Classification_advanced_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_advanced_widget.ui rename to Lab/demo/Lab/Plugins/Classification/Classification_advanced_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_plugin.cpp b/Lab/demo/Lab/Plugins/Classification/Classification_plugin.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_plugin.cpp rename to Lab/demo/Lab/Plugins/Classification/Classification_plugin.cpp index 5ac906e1c560..d75cf0e3f73c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Classification/Classification_plugin.cpp @@ -19,7 +19,7 @@ #include "Scene_polygon_soup_item.h" #include -#include +#include #include #include @@ -48,13 +48,13 @@ using namespace CGAL::Three; -class Polyhedron_demo_classification_plugin : +class CGAL_Lab_classification_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") struct LabelButton { @@ -136,7 +136,7 @@ class Polyhedron_demo_classification_plugin : void print_message(QString message) { CGAL::Three::Three::information(message); } QList actions() const { return QList() << actionClassification; } - using Polyhedron_demo_plugin_helper::init; + using CGAL_Lab_plugin_helper::init; void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { mw = mainWindow; @@ -1714,6 +1714,6 @@ public Q_SLOTS: Item_map item_map; -}; // end Polyhedron_demo_classification_plugin +}; // end CGAL_Lab_classification_plugin #include "Classification_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_widget.ui b/Lab/demo/Lab/Plugins/Classification/Classification_widget.ui similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_widget.ui rename to Lab/demo/Lab/Plugins/Classification/Classification_widget.ui index e96efa5c7d3e..3bd4c66dc881 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Classification/Classification_widget.ui +++ b/Lab/demo/Lab/Plugins/Classification/Classification_widget.ui @@ -64,7 +64,7 @@ - + :/cgal/icons/resources/help_button.png:/cgal/icons/resources/help_button.png @@ -75,7 +75,7 @@ - + :/cgal/icons/check-off.png:/cgal/icons/check-off.png @@ -195,7 +195,7 @@ - + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp b/Lab/demo/Lab/Plugins/Classification/Cluster_classification.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.cpp rename to Lab/demo/Lab/Plugins/Classification/Cluster_classification.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.h b/Lab/demo/Lab/Plugins/Classification/Cluster_classification.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Cluster_classification.h rename to Lab/demo/Lab/Plugins/Classification/Cluster_classification.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Item_classification_base.h b/Lab/demo/Lab/Plugins/Classification/Item_classification_base.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Item_classification_base.h rename to Lab/demo/Lab/Plugins/Classification/Item_classification_base.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp b/Lab/demo/Lab/Plugins/Classification/Point_set_item_classification.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.cpp rename to Lab/demo/Lab/Plugins/Classification/Point_set_item_classification.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.h b/Lab/demo/Lab/Plugins/Classification/Point_set_item_classification.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Point_set_item_classification.h rename to Lab/demo/Lab/Plugins/Classification/Point_set_item_classification.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp b/Lab/demo/Lab/Plugins/Classification/Surface_mesh_item_classification.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.cpp rename to Lab/demo/Lab/Plugins/Classification/Surface_mesh_item_classification.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.h b/Lab/demo/Lab/Plugins/Classification/Surface_mesh_item_classification.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Classification/Surface_mesh_item_classification.h rename to Lab/demo/Lab/Plugins/Classification/Surface_mesh_item_classification.h diff --git a/Lab/demo/Lab/Plugins/Convex_decomposition/CMakeLists.txt b/Lab/demo/Lab/Plugins/Convex_decomposition/CMakeLists.txt new file mode 100644 index 000000000000..37bd33d7bc2f --- /dev/null +++ b/Lab/demo/Lab/Plugins/Convex_decomposition/CMakeLists.txt @@ -0,0 +1,4 @@ +include(cgallab_macros) + +cgal_lab_plugin(nef_plugin Nef_plugin) +target_link_libraries(nef_plugin PUBLIC scene_nef_polyhedron_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp b/Lab/demo/Lab/Plugins/Convex_decomposition/Nef_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp rename to Lab/demo/Lab/Plugins/Convex_decomposition/Nef_plugin.cpp index c5b7a5c04c88..6af71c9242a1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Convex_decomposition/Nef_plugin.cpp @@ -1,7 +1,7 @@ #include "Scene_surface_mesh_item.h" #include "Scene_nef_polyhedron_item.h" -#include +#include #include #include @@ -11,13 +11,13 @@ #include #include using namespace CGAL::Three; -class Polyhedron_demo_nef_plugin : +class CGAL_Lab_nef_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: @@ -100,10 +100,10 @@ public Q_SLOTS: void on_actionDifference_triggered(); void on_actionMinkowskiSum_triggered(); void on_actionConvexDecomposition_triggered(); -}; // end class Polyhedron_demo_nef_plugin +}; // end class CGAL_Lab_nef_plugin void -Polyhedron_demo_nef_plugin::on_actionToNef_triggered() +CGAL_Lab_nef_plugin::on_actionToNef_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -133,7 +133,7 @@ Polyhedron_demo_nef_plugin::on_actionToNef_triggered() void -Polyhedron_demo_nef_plugin::on_actionConvexDecomposition_triggered() +CGAL_Lab_nef_plugin::on_actionConvexDecomposition_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -178,7 +178,7 @@ Polyhedron_demo_nef_plugin::on_actionConvexDecomposition_triggered() } void -Polyhedron_demo_nef_plugin::on_actionToPoly_triggered() +CGAL_Lab_nef_plugin::on_actionToPoly_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -213,21 +213,21 @@ Polyhedron_demo_nef_plugin::on_actionToPoly_triggered() } } -void Polyhedron_demo_nef_plugin::on_actionUnion_triggered() +void CGAL_Lab_nef_plugin::on_actionUnion_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); boolean_operation(BOOLEAN_UNION); QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_nef_plugin::on_actionIntersection_triggered() +void CGAL_Lab_nef_plugin::on_actionIntersection_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); boolean_operation(BOOLEAN_INTERSECTION); QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_nef_plugin::on_actionDifference_triggered() +void CGAL_Lab_nef_plugin::on_actionDifference_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); boolean_operation(BOOLEAN_DIFFERENCE); @@ -235,14 +235,14 @@ void Polyhedron_demo_nef_plugin::on_actionDifference_triggered() } void -Polyhedron_demo_nef_plugin::on_actionMinkowskiSum_triggered() +CGAL_Lab_nef_plugin::on_actionMinkowskiSum_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); boolean_operation(MINKOWSKI_SUM); QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_nef_plugin::boolean_operation(const Boolean_operation operation) +void CGAL_Lab_nef_plugin::boolean_operation(const Boolean_operation operation) { const int indexA = scene->selectionAindex(); const int indexB = scene->selectionBindex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/CMakeLists.txt b/Lab/demo/Lab/Plugins/Convex_hull/CMakeLists.txt similarity index 75% rename from Polyhedron/demo/Polyhedron/Plugins/Convex_hull/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Convex_hull/CMakeLists.txt index 9897d0bb7894..4b0ecd2ac946 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Convex_hull/CMakeLists.txt @@ -1,12 +1,12 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) -polyhedron_demo_plugin(convex_hull_plugin Convex_hull_plugin KEYWORDS +cgal_lab_plugin(convex_hull_plugin Convex_hull_plugin KEYWORDS PointSetProcessing) target_link_libraries( convex_hull_plugin PUBLIC scene_points_with_normal_item scene_polylines_item scene_selection_item scene_surface_mesh_item) -polyhedron_demo_plugin(kernel_plugin Kernel_plugin) +cgal_lab_plugin(kernel_plugin Kernel_plugin) target_link_libraries(kernel_plugin PUBLIC scene_surface_mesh_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp b/Lab/demo/Lab/Plugins/Convex_hull/Convex_hull_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp rename to Lab/demo/Lab/Plugins/Convex_hull/Convex_hull_plugin.cpp index b7df3dde9e9e..dfd173cae62e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Convex_hull/Convex_hull_plugin.cpp @@ -9,19 +9,19 @@ #include "Scene_polyhedron_selection_item.h" #include "SMesh_type.h" -#include +#include #include #include #include using namespace CGAL::Three; -class Polyhedron_demo_convex_hull_plugin : +class CGAL_Lab_convex_hull_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow*mw, Scene_interface* scene_interface, @@ -51,10 +51,10 @@ public Q_SLOTS: QList _actions; Scene_interface* scene; QMainWindow* mw; -}; // end Polyhedron_demo_convex_hull_plugin +}; // end CGAL_Lab_convex_hull_plugin -void Polyhedron_demo_convex_hull_plugin::on_actionConvexHull_triggered() +void CGAL_Lab_convex_hull_plugin::on_actionConvexHull_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_points_with_normal_item* pts_item = diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp b/Lab/demo/Lab/Plugins/Convex_hull/Kernel_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp rename to Lab/demo/Lab/Plugins/Convex_hull/Kernel_plugin.cpp index 77de7dfaa1bc..a5aaf34054ae 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Convex_hull/Kernel_plugin.cpp @@ -8,7 +8,7 @@ #include "Scene_surface_mesh_item.h" #include "SMesh_type.h" -#include +#include #include #include #include @@ -24,13 +24,13 @@ typedef Kernel::Vector_3 Vector; typedef Kernel::Plane_3 Plane; typedef Kernel::FT FT; using namespace CGAL::Three; -class Polyhedron_demo_kernel_plugin : +class CGAL_Lab_kernel_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: QList actions() const { @@ -57,10 +57,10 @@ public Q_SLOTS: CGAL::Three::Scene_interface* scene; QMainWindow* mw; -}; // end Polyhedron_demo_kernel_plugin +}; // end CGAL_Lab_kernel_plugin -void Polyhedron_demo_kernel_plugin::on_actionKernel_triggered() +void CGAL_Lab_kernel_plugin::on_actionKernel_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt b/Lab/demo/Lab/Plugins/Display/CMakeLists.txt similarity index 72% rename from Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Display/CMakeLists.txt index 0c251b585cb9..cdfa77c9f5f4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Display/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Display/CMakeLists.txt @@ -1,14 +1,14 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) qt6_wrap_ui(display_propertyUI_FILES Display_property.ui) -polyhedron_demo_plugin(display_property_plugin Display_property_plugin ${display_propertyUI_FILES} KEYWORDS Viewer) +cgal_lab_plugin(display_property_plugin Display_property_plugin ${display_propertyUI_FILES} KEYWORDS Viewer) target_link_libraries(display_property_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item scene_color_ramp) if(TARGET CGAL::Eigen3_support) qt6_wrap_ui(heat_methodUI_FILES Heat_method.ui) - polyhedron_demo_plugin(heat_method_plugin Heat_method_plugin ${heat_methodUI_FILES} KEYWORDS Viewer) + cgal_lab_plugin(heat_method_plugin Heat_method_plugin ${heat_methodUI_FILES} KEYWORDS Viewer) target_link_libraries(heat_method_plugin PUBLIC scene_surface_mesh_item scene_selection_item scene_color_ramp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property.ui b/Lab/demo/Lab/Plugins/Display/Display_property.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Display/Display_property.ui rename to Lab/demo/Lab/Plugins/Display/Display_property.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp b/Lab/demo/Lab/Plugins/Display/Display_property_plugin.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp rename to Lab/demo/Lab/Plugins/Display/Display_property_plugin.cpp index 68826d91862f..ec4b1647c08f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Display/Display_property_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Display/Display_property_plugin.cpp @@ -11,8 +11,8 @@ #include "Scene_points_with_normal_item.h" #include "triangulate_primitive.h" -#include -#include +#include +#include #include #include #include @@ -67,11 +67,11 @@ class DockWidget class Display_property_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: QAction* actionDisplayProperties; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/Heat_method.ui b/Lab/demo/Lab/Plugins/Display/Heat_method.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Display/Heat_method.ui rename to Lab/demo/Lab/Plugins/Display/Heat_method.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Display/Heat_method_plugin.cpp b/Lab/demo/Lab/Plugins/Display/Heat_method_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Display/Heat_method_plugin.cpp rename to Lab/demo/Lab/Plugins/Display/Heat_method_plugin.cpp index a1c13d1c6a8f..7cf450a671d1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Display/Heat_method_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Display/Heat_method_plugin.cpp @@ -9,8 +9,8 @@ #include "Scene_polyhedron_selection_item.h" #include "Scene_surface_mesh_item.h" -#include -#include +#include +#include #include #include #include @@ -207,11 +207,11 @@ class DockWidget class Heat_method_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") using Vertex_distance_map = SMesh::Property_map; using Heat_method = CGAL::Heat_method_3::Surface_mesh_geodesic_distances_3; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/3mf_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/3mf_io_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/IO/3mf_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/3mf_io_plugin.cpp index d757a5aaba24..b382ee84f2ef 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/3mf_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/3mf_io_plugin.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include @@ -21,11 +21,11 @@ using namespace NMR; class Io_3mf_plugin: public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "3mf_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "3mf_io_plugin.json") typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef std::vector PointRange; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt b/Lab/demo/Lab/Plugins/IO/CMakeLists.txt similarity index 74% rename from Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt rename to Lab/demo/Lab/Plugins/IO/CMakeLists.txt index d80560ab5d4a..b42cf127ca8e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/IO/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) find_package(LASLIB QUIET) set_package_properties( @@ -8,39 +8,39 @@ set_package_properties( include(CGAL_LASLIB_support) -polyhedron_demo_plugin(gocad_plugin GOCAD_io_plugin KEYWORDS Viewer) +cgal_lab_plugin(gocad_plugin GOCAD_io_plugin KEYWORDS Viewer) target_link_libraries(gocad_plugin PUBLIC scene_surface_mesh_item) qt6_wrap_ui( funcUI_FILES Function_dialog.ui ) -polyhedron_demo_plugin(io_implicit_function_plugin +cgal_lab_plugin(io_implicit_function_plugin Implicit_function_io_plugin ${funcUI_FILES} KEYWORDS Viewer Mesh_3) target_link_libraries(io_implicit_function_plugin PUBLIC scene_implicit_function_item) -polyhedron_demo_plugin(nef_io_plugin Nef_io_plugin KEYWORDS Viewer) +cgal_lab_plugin(nef_io_plugin Nef_io_plugin KEYWORDS Viewer) target_link_libraries(nef_io_plugin PUBLIC scene_nef_polyhedron_item) -polyhedron_demo_plugin(off_plugin OFF_io_plugin +cgal_lab_plugin(off_plugin OFF_io_plugin KEYWORDS Viewer Mesh_3 PointSetProcessing Classification PMP) target_link_libraries(off_plugin PUBLIC scene_polygon_soup_item scene_points_with_normal_item scene_surface_mesh_item) -polyhedron_demo_plugin(off_to_nef_plugin OFF_to_nef_io_plugin KEYWORDS Viewer) +cgal_lab_plugin(off_to_nef_plugin OFF_to_nef_io_plugin KEYWORDS Viewer) target_link_libraries(off_to_nef_plugin PUBLIC scene_nef_polyhedron_item) -polyhedron_demo_plugin(polylines_io_plugin Polylines_io_plugin KEYWORDS Viewer Mesh_3) +cgal_lab_plugin(polylines_io_plugin Polylines_io_plugin KEYWORDS Viewer Mesh_3) target_link_libraries(polylines_io_plugin PUBLIC scene_polylines_item) -polyhedron_demo_plugin(wkt_plugin WKT_io_plugin KEYWORDS Viewer PointSetProcessing Mesh_3) +cgal_lab_plugin(wkt_plugin WKT_io_plugin KEYWORDS Viewer PointSetProcessing Mesh_3) target_link_libraries(wkt_plugin PUBLIC scene_polylines_item) -polyhedron_demo_plugin(stl_plugin STL_io_plugin KEYWORDS Viewer PMP) +cgal_lab_plugin(stl_plugin STL_io_plugin KEYWORDS Viewer PMP) target_link_libraries(stl_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item) -polyhedron_demo_plugin(surf_io_plugin Surf_io_plugin KEYWORDS Viewer PMP) +cgal_lab_plugin(surf_io_plugin Surf_io_plugin KEYWORDS Viewer PMP) target_link_libraries(surf_io_plugin PUBLIC scene_surface_mesh_item) -polyhedron_demo_plugin(lcc_io_plugin lcc_io_plugin KEYWORDS Viewer) +cgal_lab_plugin(lcc_io_plugin lcc_io_plugin KEYWORDS Viewer) target_link_libraries(lcc_io_plugin PUBLIC scene_lcc_item) find_package(VTK QUIET COMPONENTS vtkCommonCore vtkIOCore vtkIOLegacy vtkIOXML @@ -50,7 +50,7 @@ set_package_properties( DESCRIPTION "A library for image processing." PURPOSE "Can be used for I/O (DICOM, VTU, VTP.") -polyhedron_demo_plugin(triangulation_3_io_plugin triangulation_3_io_plugin KEYWORDS Viewer) +cgal_lab_plugin(triangulation_3_io_plugin triangulation_3_io_plugin KEYWORDS Viewer) target_link_libraries(triangulation_3_io_plugin PUBLIC scene_triangulation_3_item) if(VTK_FOUND) @@ -63,7 +63,7 @@ if(VTK_FOUND) VTK::FiltersCore VTK::FiltersSources) endif() if(VTK_LIBRARIES) - polyhedron_demo_plugin(vtk_plugin VTK_io_plugin KEYWORDS Viewer Mesh_3) + cgal_lab_plugin(vtk_plugin VTK_io_plugin KEYWORDS Viewer Mesh_3) target_link_libraries(vtk_plugin PUBLIC scene_surface_mesh_item scene_polylines_item scene_c3t3_item scene_points_with_normal_item ${VTK_LIBRARIES}) target_compile_definitions(vtk_plugin PRIVATE -DCGAL_USE_VTK -DNOMINMAX) @@ -76,13 +76,13 @@ if(VTK_FOUND) else() message(STATUS "NOTICE: the vtk IO plugin needs VTK 6.0 or greater and will not be compiled.") endif() -polyhedron_demo_plugin(xyz_plugin XYZ_io_plugin KEYWORDS Viewer PointSetProcessing Classification) +cgal_lab_plugin(xyz_plugin XYZ_io_plugin KEYWORDS Viewer PointSetProcessing Classification) target_link_libraries(xyz_plugin PUBLIC scene_points_with_normal_item) -polyhedron_demo_plugin(ply_plugin PLY_io_plugin KEYWORDS Viewer PointSetProcessing Classification PMP) +cgal_lab_plugin(ply_plugin PLY_io_plugin KEYWORDS Viewer PointSetProcessing Classification PMP) target_link_libraries(ply_plugin PUBLIC scene_points_with_normal_item scene_polygon_soup_item scene_surface_mesh_item scene_textured_item) if (TARGET CGAL::LASLIB_support) - polyhedron_demo_plugin(las_plugin LAS_io_plugin KEYWORDS Viewer PointSetProcessing Classification) + cgal_lab_plugin(las_plugin LAS_io_plugin KEYWORDS Viewer PointSetProcessing Classification) target_link_libraries(las_plugin PUBLIC scene_points_with_normal_item CGAL::LASLIB_support) if(MSVC) target_compile_definitions( @@ -107,7 +107,7 @@ if(3MF_LIBRARIES AND 3MF_INCLUDE_DIR AND EXISTS "${3MF_INCLUDE_DIR}/Model/COM/NMR_DLLInterfaces.h") include_directories(${3MF_INCLUDE_DIR}) - polyhedron_demo_plugin(io_3mf_plugin 3mf_io_plugin KEYWORDS Viewer PMP) + cgal_lab_plugin(io_3mf_plugin 3mf_io_plugin KEYWORDS Viewer PMP) target_link_libraries(io_3mf_plugin PRIVATE scene_surface_mesh_item scene_points_with_normal_item scene_polylines_item ${3MF_LIBRARIES}) target_compile_definitions(io_3mf_plugin PRIVATE -DCGAL_LINKED_WITH_3MF) else() diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Function_dialog.ui b/Lab/demo/Lab/Plugins/IO/Function_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/IO/Function_dialog.ui rename to Lab/demo/Lab/Plugins/IO/Function_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/GOCAD_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/GOCAD_io_plugin.cpp similarity index 79% rename from Polyhedron/demo/Polyhedron/Plugins/IO/GOCAD_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/GOCAD_io_plugin.cpp index 36233827a32a..fab076c3b347 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/GOCAD_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/GOCAD_io_plugin.cpp @@ -5,9 +5,9 @@ #include "SMesh_type.h" #include -#include -#include -#include +#include +#include +#include #include #include @@ -18,14 +18,14 @@ using namespace CGAL::Three; -class Polyhedron_demo_gocad_plugin : +class CGAL_Lab_gocad_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "gocad_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "gocad_io_plugin.json") public: @@ -38,17 +38,17 @@ class Polyhedron_demo_gocad_plugin : bool save(QFileInfo fileinfo, QList& ); }; -QString Polyhedron_demo_gocad_plugin::nameFilters() const { +QString CGAL_Lab_gocad_plugin::nameFilters() const { return "GOCAD files (*.ts)"; } -bool Polyhedron_demo_gocad_plugin::canLoad(QFileInfo) const { +bool CGAL_Lab_gocad_plugin::canLoad(QFileInfo) const { return true; } QList -Polyhedron_demo_gocad_plugin::load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { +CGAL_Lab_gocad_plugin::load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { // Open file std::ifstream in(fileinfo.filePath().toUtf8()); @@ -101,13 +101,13 @@ Polyhedron_demo_gocad_plugin::load(QFileInfo fileinfo, bool& ok, bool add_to_sce return QList()<(item); } -bool Polyhedron_demo_gocad_plugin:: +bool CGAL_Lab_gocad_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/Implicit_function_io_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/Implicit_function_io_plugin.cpp index 628362efd0b8..77f94babd2c7 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/Implicit_function_io_plugin.cpp @@ -14,8 +14,8 @@ // File Description : //****************************************************************************** -#include -#include +#include +#include #include "implicit_functions/Implicit_function_interface.h" #include "Scene_implicit_function_item.h" @@ -33,11 +33,11 @@ using namespace CGAL::Three; class Io_implicit_function_plugin : public QObject, - protected Polyhedron_demo_plugin_helper + protected CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "implicit_function_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "implicit_function_io_plugin.json") public: Io_implicit_function_plugin(); @@ -50,7 +50,7 @@ class Io_implicit_function_plugin : // bool canLoad() const { return false; } - typedef Polyhedron_demo_plugin_helper Plugin_helper; + typedef CGAL_Lab_plugin_helper Plugin_helper; using Plugin_helper::init; virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/LAS_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/LAS_io_plugin.cpp similarity index 79% rename from Polyhedron/demo/Polyhedron/Plugins/IO/LAS_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/LAS_io_plugin.cpp index a46bc54d3bf5..faaf4c880ea8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/LAS_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/LAS_io_plugin.cpp @@ -1,17 +1,17 @@ #include "Scene_points_with_normal_item.h" -#include +#include #include #include #include #include using namespace CGAL::Three; -class Polyhedron_demo_las_plugin : +class CGAL_Lab_las_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "las_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "las_io_plugin.json") public: QString name() const { return "las_plugin"; } @@ -23,11 +23,11 @@ class Polyhedron_demo_las_plugin : bool save(QFileInfo fileinfo,QList& ); }; -bool Polyhedron_demo_las_plugin::canLoad(QFileInfo ) const { +bool CGAL_Lab_las_plugin::canLoad(QFileInfo ) const { return true; } -QList Polyhedron_demo_las_plugin:: +QList CGAL_Lab_las_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { std::ifstream in(fileinfo.filePath().toUtf8(), std::ios_base::binary); @@ -70,12 +70,12 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { return QList()<(item); } -bool Polyhedron_demo_las_plugin::save(QFileInfo fileinfo,QList& items) +bool CGAL_Lab_las_plugin::save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); // Check extension (quietly) diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Nef_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/Nef_io_plugin.cpp similarity index 78% rename from Polyhedron/demo/Polyhedron/Plugins/IO/Nef_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/Nef_io_plugin.cpp index 25b5c1d7432b..95e31eb98080 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Nef_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/Nef_io_plugin.cpp @@ -1,18 +1,18 @@ #include "Scene_nef_polyhedron_item.h" -#include +#include #include #include #include using namespace CGAL::Three; -class Polyhedron_demo_io_nef_plugin : +class CGAL_Lab_io_nef_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "nef_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "nef_io_plugin.json") public: QString nameFilters() const override; @@ -29,16 +29,16 @@ class Polyhedron_demo_io_nef_plugin : } }; -QString Polyhedron_demo_io_nef_plugin::nameFilters() const { +QString CGAL_Lab_io_nef_plugin::nameFilters() const { return "nef files (*.nef3)"; } -bool Polyhedron_demo_io_nef_plugin::canLoad(QFileInfo) const { +bool CGAL_Lab_io_nef_plugin::canLoad(QFileInfo) const { return true; } -QList Polyhedron_demo_io_nef_plugin:: +QList CGAL_Lab_io_nef_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { //do not try file with extension different from nef3 if (fileinfo.suffix() != "nef3") @@ -79,13 +79,13 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { return QList()<(item); } -bool Polyhedron_demo_io_nef_plugin::save(QFileInfo fileinfo,QList& items) +bool CGAL_Lab_io_nef_plugin::save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); // This plugin supports polyhedrons and polygon soups diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/OFF_io_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/OFF_io_plugin.cpp index c413104e883b..e0677c1c6635 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/OFF_io_plugin.cpp @@ -3,7 +3,7 @@ #include "Scene_points_with_normal_item.h" #include -#include +#include #include #include @@ -20,13 +20,13 @@ using namespace CGAL::Three; -class Polyhedron_demo_off_plugin : +class CGAL_Lab_off_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "off_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "off_io_plugin.json") public: bool isDefaultLoader(const Scene_item *item) const override @@ -53,11 +53,11 @@ class Polyhedron_demo_off_plugin : bool save(QFileInfo fileinfo,QList& ) override; }; -bool Polyhedron_demo_off_plugin::canLoad(QFileInfo) const { +bool CGAL_Lab_off_plugin::canLoad(QFileInfo) const { return true; } -QList Polyhedron_demo_off_plugin:: +QList CGAL_Lab_off_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { if(fileinfo.size() == 0) @@ -105,7 +105,7 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { CGAL::Three::Scene_item* -Polyhedron_demo_off_plugin::load_off(QFileInfo fileinfo) { +CGAL_Lab_off_plugin::load_off(QFileInfo fileinfo) { // Open file std::ifstream in(fileinfo.filePath().toUtf8()); if(!in) { @@ -207,7 +207,7 @@ Polyhedron_demo_off_plugin::load_off(QFileInfo fileinfo) { } CGAL::Three::Scene_item* -Polyhedron_demo_off_plugin::load_obj(QFileInfo fileinfo) { +CGAL_Lab_off_plugin::load_obj(QFileInfo fileinfo) { // Open file std::ifstream in(fileinfo.filePath().toUtf8()); if(!in) { @@ -230,7 +230,7 @@ Polyhedron_demo_off_plugin::load_obj(QFileInfo fileinfo) { return nullptr; } -bool Polyhedron_demo_off_plugin::canSave(const CGAL::Three::Scene_item* item) +bool CGAL_Lab_off_plugin::canSave(const CGAL::Three::Scene_item* item) { // This plugin supports surface_meshes and polygon soups return qobject_cast(item) || @@ -240,7 +240,7 @@ bool Polyhedron_demo_off_plugin::canSave(const CGAL::Three::Scene_item* item) bool -Polyhedron_demo_off_plugin:: +CGAL_Lab_off_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_to_nef_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/OFF_to_nef_io_plugin.cpp similarity index 71% rename from Polyhedron/demo/Polyhedron/Plugins/IO/OFF_to_nef_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/OFF_to_nef_io_plugin.cpp index 9e6cfd399ee4..f5cea640b934 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_to_nef_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/OFF_to_nef_io_plugin.cpp @@ -1,17 +1,17 @@ #include "Scene_nef_polyhedron_item.h" #include "Nef_type.h" -#include +#include #include #include using namespace CGAL::Three; -class Polyhedron_demo_off_to_nef_plugin : +class CGAL_Lab_off_to_nef_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "off_to_nef_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "off_to_nef_io_plugin.json") public: QString name() const { return "off_to_nef_plugin"; } @@ -23,11 +23,11 @@ class Polyhedron_demo_off_to_nef_plugin : bool save(QFileInfo fileinfo,QList& ); }; -bool Polyhedron_demo_off_to_nef_plugin::canLoad(QFileInfo) const { +bool CGAL_Lab_off_to_nef_plugin::canLoad(QFileInfo) const { return true; } -QList Polyhedron_demo_off_to_nef_plugin:: +QList CGAL_Lab_off_to_nef_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene){ std::ifstream in(fileinfo.filePath().toUtf8()); @@ -57,12 +57,12 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene){ return QList()<&) { return false; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/PLY_io_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/PLY_io_plugin.cpp index fe4120c59191..917f13a844e1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/PLY_io_plugin.cpp @@ -4,7 +4,7 @@ #include "Scene_points_with_normal_item.h" #include -#include +#include #include #include @@ -21,13 +21,13 @@ using namespace CGAL::Three; -class Polyhedron_demo_ply_plugin : +class CGAL_Lab_ply_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "ply_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "ply_io_plugin.json") public: bool isDefaultLoader(const CGAL::Three::Scene_item *item) const override @@ -46,13 +46,13 @@ class Polyhedron_demo_ply_plugin : }; -bool Polyhedron_demo_ply_plugin:: +bool CGAL_Lab_ply_plugin:: canLoad(QFileInfo) const { return true; } QList -Polyhedron_demo_ply_plugin:: +CGAL_Lab_ply_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { std::ifstream in(fileinfo.filePath().toUtf8(), std::ios_base::binary); @@ -175,7 +175,7 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { return QList(); } -bool Polyhedron_demo_ply_plugin::canSave(const CGAL::Three::Scene_item* item) +bool CGAL_Lab_ply_plugin::canSave(const CGAL::Three::Scene_item* item) { // This plugin supports point sets and any type of surface return (qobject_cast(item) @@ -184,7 +184,7 @@ bool Polyhedron_demo_ply_plugin::canSave(const CGAL::Three::Scene_item* item) || qobject_cast(item)); } -bool Polyhedron_demo_ply_plugin:: +bool CGAL_Lab_ply_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/Polylines_io_plugin.cpp similarity index 90% rename from Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/Polylines_io_plugin.cpp index 75503490a2a9..b737f8f3710a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/Polylines_io_plugin.cpp @@ -1,9 +1,9 @@ #include "Scene_polylines_item.h" #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -14,22 +14,22 @@ #include #include using namespace CGAL::Three; -class Polyhedron_demo_polylines_io_plugin : +class CGAL_Lab_polylines_io_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_io_plugin_interface, + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "polylines_io_plugin.json") - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "polylines_io_plugin.json") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90") public: // To silent a warning -Woverloaded-virtual // See https://stackoverflow.com/questions/9995421/gcc-woverloaded-virtual-warnings - using Polyhedron_demo_io_plugin_interface::init; + using CGAL_Lab_io_plugin_interface::init; //! Configures the widget void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, @@ -54,10 +54,10 @@ class Polyhedron_demo_polylines_io_plugin : actionSimplify_polylines->setProperty("subMenuName", "Operations on Polylines"); actionSimplify_polylines->setObjectName("actionSimplifyPolylines"); - connect(actionSplit_polylines, &QAction::triggered, this, &Polyhedron_demo_polylines_io_plugin::split); - connect(actionSplit_polylines_graph, &QAction::triggered, this, &Polyhedron_demo_polylines_io_plugin::split_graph); - connect(actionJoin_polylines, &QAction::triggered, this, &Polyhedron_demo_polylines_io_plugin::join); - connect(actionSimplify_polylines, &QAction::triggered, this, &Polyhedron_demo_polylines_io_plugin::simplify); + connect(actionSplit_polylines, &QAction::triggered, this, &CGAL_Lab_polylines_io_plugin::split); + connect(actionSplit_polylines_graph, &QAction::triggered, this, &CGAL_Lab_polylines_io_plugin::split_graph); + connect(actionJoin_polylines, &QAction::triggered, this, &CGAL_Lab_polylines_io_plugin::join); + connect(actionSimplify_polylines, &QAction::triggered, this, &CGAL_Lab_polylines_io_plugin::simplify); } @@ -118,7 +118,7 @@ class Polyhedron_demo_polylines_io_plugin : QAction* actionSimplify_polylines; }; -bool Polyhedron_demo_polylines_io_plugin::canLoad(QFileInfo fileinfo) const{ +bool CGAL_Lab_polylines_io_plugin::canLoad(QFileInfo fileinfo) const{ if(!fileinfo.suffix().contains("cgal")) return true; std::ifstream in(fileinfo.filePath().toUtf8()); @@ -134,7 +134,7 @@ bool Polyhedron_demo_polylines_io_plugin::canLoad(QFileInfo fileinfo) const{ QList -Polyhedron_demo_polylines_io_plugin:: +CGAL_Lab_polylines_io_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene){ // Open file @@ -212,12 +212,12 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene){ return QList()<(item) != 0; } -bool Polyhedron_demo_polylines_io_plugin:: +bool CGAL_Lab_polylines_io_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); @@ -259,7 +259,7 @@ save(QFileInfo fileinfo,QList& items) return res; } -void Polyhedron_demo_polylines_io_plugin::split() +void CGAL_Lab_polylines_io_plugin::split() { Scene_polylines_item* item = qobject_cast(scene->item(scene->mainSelectionIndex())); Scene_group_item* group = new Scene_group_item("Split Polylines"); @@ -324,7 +324,7 @@ polylines_to_split(std::vector >& polylines, CGAL::split_graph_into_polylines(const_graph, visitor); } -void Polyhedron_demo_polylines_io_plugin::split_graph() +void CGAL_Lab_polylines_io_plugin::split_graph() { Scene_item* main_item = scene->item(scene->mainSelectionIndex()); Scene_polylines_item* polylines_item = @@ -339,7 +339,7 @@ void Polyhedron_demo_polylines_io_plugin::split_graph() scene->addItem(new_item); } -void Polyhedron_demo_polylines_io_plugin::simplify() +void CGAL_Lab_polylines_io_plugin::simplify() { Scene_polylines_item* item = qobject_cast(scene->item(scene->mainSelectionIndex())); bool ok; @@ -362,7 +362,7 @@ void Polyhedron_demo_polylines_io_plugin::simplify() item->redraw(); } -void Polyhedron_demo_polylines_io_plugin::join() +void CGAL_Lab_polylines_io_plugin::join() { std::vector items; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/STL_io_plugin.cpp similarity index 87% rename from Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/STL_io_plugin.cpp index 20fa2f36ca10..5515bbc1a589 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/STL_io_plugin.cpp @@ -4,7 +4,7 @@ #include "Kernel_type.h" #include "Scene.h" -#include +#include #include #include @@ -26,13 +26,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_stl_plugin : +class CGAL_Lab_stl_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "stl_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "stl_io_plugin.json") public: QString nameFilters() const; @@ -44,18 +44,18 @@ class Polyhedron_demo_stl_plugin : bool save(QFileInfo fileinfo,QList&); }; -QString Polyhedron_demo_stl_plugin::nameFilters() const { +QString CGAL_Lab_stl_plugin::nameFilters() const { return "STL files (*.stl)"; } -bool Polyhedron_demo_stl_plugin::canLoad(QFileInfo) const { +bool CGAL_Lab_stl_plugin::canLoad(QFileInfo) const { return true; } QList -Polyhedron_demo_stl_plugin:: +CGAL_Lab_stl_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene){ // Open file @@ -120,12 +120,12 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene){ return QList()<(item); } -bool Polyhedron_demo_stl_plugin:: +bool CGAL_Lab_stl_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Surf_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/Surf_io_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/IO/Surf_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/Surf_io_plugin.cpp index c939b1fb0864..2dd051b6bbf4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Surf_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/Surf_io_plugin.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include @@ -18,11 +18,11 @@ using namespace CGAL::Three; class Surf_io_plugin: public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "surf_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "surf_io_plugin.json") public: diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/VTK_io_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/VTK_io_plugin.cpp index ca824a3e9ee9..58512209f23e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/VTK_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/VTK_io_plugin.cpp @@ -18,8 +18,8 @@ #include "Scene_polylines_item.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -183,13 +183,13 @@ namespace CGAL{ }//end namespace CGAL -class Polyhedron_demo_vtk_plugin : +class CGAL_Lab_vtk_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "vtk_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "vtk_io_plugin.json") public: typedef boost::graph_traits::vertex_descriptor vertex_descriptor; @@ -543,7 +543,7 @@ class Polyhedron_demo_vtk_plugin : CGAL::Three::Three::scene()->addItem(point_item); return QList()< +#include #include #include #include @@ -10,13 +10,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_wkt_plugin : +class CGAL_Lab_wkt_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "wkt_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "wkt_io_plugin.json") public: bool isDefaultLoader(const CGAL::Three::Scene_item *item) const @@ -37,13 +37,13 @@ class Polyhedron_demo_wkt_plugin : bool save(QFileInfo fileinfo,QList&); }; -bool Polyhedron_demo_wkt_plugin:: +bool CGAL_Lab_wkt_plugin:: canLoad(QFileInfo) const { return true; } QList -Polyhedron_demo_wkt_plugin:: +CGAL_Lab_wkt_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { std::ifstream in(fileinfo.filePath().toUtf8(), std::ios_base::binary); @@ -77,13 +77,13 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { return QList() << item; } -bool Polyhedron_demo_wkt_plugin::canSave(const CGAL::Three::Scene_item* item) +bool CGAL_Lab_wkt_plugin::canSave(const CGAL::Three::Scene_item* item) { // This plugin supports polylines return (qobject_cast(item)); } -bool Polyhedron_demo_wkt_plugin:: +bool CGAL_Lab_wkt_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/XYZ_io_plugin.cpp similarity index 84% rename from Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/XYZ_io_plugin.cpp index 174ecaa9f9fd..253abdb867b8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/XYZ_io_plugin.cpp @@ -2,20 +2,20 @@ #include "Kernel_type.h" #include -#include +#include #include #include #include #include using namespace CGAL::Three; -class Polyhedron_demo_xyz_plugin : +class CGAL_Lab_xyz_plugin : public QObject, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "xyz_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "xyz_io_plugin.json") public: @@ -28,13 +28,13 @@ class Polyhedron_demo_xyz_plugin : bool save(QFileInfo fileinfo,QList&); }; -bool Polyhedron_demo_xyz_plugin::canLoad(QFileInfo) const { +bool CGAL_Lab_xyz_plugin::canLoad(QFileInfo) const { return true; } QList -Polyhedron_demo_xyz_plugin:: +CGAL_Lab_xyz_plugin:: load(QFileInfo fileinfo, bool& ok, bool add_to_scene) { // Open file @@ -74,13 +74,13 @@ load(QFileInfo fileinfo, bool& ok, bool add_to_scene) return QList()<(item); } -bool Polyhedron_demo_xyz_plugin:: +bool CGAL_Lab_xyz_plugin:: save(QFileInfo fileinfo,QList& items) { Scene_item* item = items.front(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/lcc_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/lcc_io_plugin.cpp similarity index 86% rename from Polyhedron/demo/Polyhedron/Plugins/IO/lcc_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/lcc_io_plugin.cpp index c5ef473636f2..027b52fd69ef 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/lcc_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/lcc_io_plugin.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include @@ -10,11 +10,11 @@ class LCC_io_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "lcc_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "lcc_io_plugin.json") public: bool isDefaultLoader(const CGAL::Three::Scene_item *item) const override diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/triangulation_3_io_plugin.cpp b/Lab/demo/Lab/Plugins/IO/triangulation_3_io_plugin.cpp similarity index 89% rename from Polyhedron/demo/Polyhedron/Plugins/IO/triangulation_3_io_plugin.cpp rename to Lab/demo/Lab/Plugins/IO/triangulation_3_io_plugin.cpp index b0312c5eb6a5..a44639008a49 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/triangulation_3_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/IO/triangulation_3_io_plugin.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include "T3_type.h" #include #include @@ -8,11 +8,11 @@ class Triangulation_3_io_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "triangulation_3_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "triangulation_3_io_plugin.json") public: diff --git a/Polyhedron/demo/Polyhedron/Plugins/Isosurfacing_3/CMakeLists.txt b/Lab/demo/Lab/Plugins/Isosurfacing_3/CMakeLists.txt similarity index 56% rename from Polyhedron/demo/Polyhedron/Plugins/Isosurfacing_3/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Isosurfacing_3/CMakeLists.txt index 8707fb421bde..dd6d352dfbe7 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Isosurfacing_3/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Isosurfacing_3/CMakeLists.txt @@ -1,6 +1,6 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) -polyhedron_demo_plugin(isosurface_3_plugin Isosurface_3_plugin KEYWORDS +cgal_lab_plugin(isosurface_3_plugin Isosurface_3_plugin KEYWORDS Isosurface_3) target_link_libraries( isosurface_3_plugin PUBLIC scene_polygon_soup_item scene_image_item ) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Isosurfacing_3/Isosurface_3_plugin.cpp b/Lab/demo/Lab/Plugins/Isosurfacing_3/Isosurface_3_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/Isosurfacing_3/Isosurface_3_plugin.cpp rename to Lab/demo/Lab/Plugins/Isosurfacing_3/Isosurface_3_plugin.cpp index 3e33a22f83d7..57467f98a4cb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Isosurfacing_3/Isosurface_3_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Isosurfacing_3/Isosurface_3_plugin.cpp @@ -7,18 +7,18 @@ #include "SMesh_type.h" #include "Image_type.h" -#include +#include #include #include using namespace CGAL::Three; -class Polyhedron_demo_isosurface_3_plugin : +class CGAL_Lab_isosurface_3_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow*mw, Scene_interface* scene_interface, @@ -45,9 +45,9 @@ public Q_SLOTS: QList _actions; Scene_interface* scene; QMainWindow* mw; -}; // end Polyhedron_demo_convex_hull_plugin +}; // end CGAL_Lab_convex_hull_plugin -class Polyhedron_demo_isosurface_3_plugin_helper { +class CGAL_Lab_isosurface_3_plugin_helper { typedef float Word_type; typedef std::size_t vertex_descriptor; typedef std::pair surface_descriptor; @@ -121,7 +121,7 @@ class Polyhedron_demo_isosurface_3_plugin_helper { }; public: - Polyhedron_demo_isosurface_3_plugin_helper(const Image* image) + CGAL_Lab_isosurface_3_plugin_helper(const Image* image) { image_ = image; } @@ -322,7 +322,7 @@ class Polyhedron_demo_isosurface_3_plugin_helper { } }; -void Polyhedron_demo_isosurface_3_plugin::on_actionDualLabel_triggered() +void CGAL_Lab_isosurface_3_plugin::on_actionDualLabel_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -340,7 +340,7 @@ void Polyhedron_demo_isosurface_3_plugin::on_actionDualLabel_triggered() time_per_op.start(); std::cout << "Dual contour label image..."; - Polyhedron_demo_isosurface_3_plugin_helper helper(img_item->image()); + CGAL_Lab_isosurface_3_plugin_helper helper(img_item->image()); helper.dual_contouring_label_image(); std::vector vertices; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/CMakeLists.txt b/Lab/demo/Lab/Plugins/Mesh_2/CMakeLists.txt similarity index 72% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_2/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Mesh_2/CMakeLists.txt index 3f3be1c57aac..3d5e1d8d9d34 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Mesh_2/CMakeLists.txt @@ -1,7 +1,7 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) #if the plugin has a UI file qt6_wrap_ui(mesh_2UI_FILES mesh_2_dialog.ui) -polyhedron_demo_plugin(mesh_2_plugin Mesh_2_plugin ${mesh_2UI_FILES}) +cgal_lab_plugin(mesh_2_plugin Mesh_2_plugin ${mesh_2UI_FILES}) #if the plugin uses external libraries like scene_items target_link_libraries( mesh_2_plugin PUBLIC scene_surface_mesh_item scene_polylines_item diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_2/Mesh_2_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_2/Mesh_2_plugin.cpp index 6c9e1f0a8f42..e55c30779bb6 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_2/Mesh_2_plugin.cpp @@ -11,8 +11,8 @@ #include -#include -#include +#include +#include #include "Scene_surface_mesh_item.h" @@ -139,13 +139,13 @@ void cdt2_to_face_graph(const CDT& cdt, TriangleMesh& tm, int constant_coordinat } } -class Polyhedron_demo_mesh_2_plugin : +class CGAL_Lab_mesh_2_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_helper + public CGAL::Three::CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/mesh_2_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_2/mesh_2_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_2/mesh_2_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_2/mesh_2_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/C3t3_io_plugin.cpp similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/C3t3_io_plugin.cpp index 536545443d48..af885246ea45 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/C3t3_io_plugin.cpp @@ -1,7 +1,7 @@ #include #include "Scene_c3t3_item.h" #include -#include +#include #include #include #include @@ -9,13 +9,13 @@ #include -class Polyhedron_demo_c3t3_binary_io_plugin : +class CGAL_Lab_c3t3_binary_io_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "c3t3_io_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "c3t3_io_plugin.json") public: QString name() const override { return "C3t3_io_plugin"; } @@ -42,7 +42,7 @@ class Polyhedron_demo_c3t3_binary_io_plugin : }; -bool Polyhedron_demo_c3t3_binary_io_plugin::canLoad(QFileInfo fi) const { +bool CGAL_Lab_c3t3_binary_io_plugin::canLoad(QFileInfo fi) const { if(!fi.suffix().contains("cgal")) return true; std::ifstream in(fi.filePath().toUtf8(), @@ -71,7 +71,7 @@ bool Polyhedron_demo_c3t3_binary_io_plugin::canLoad(QFileInfo fi) const { } QList -Polyhedron_demo_c3t3_binary_io_plugin::load( +CGAL_Lab_c3t3_binary_io_plugin::load( QFileInfo fileinfo, bool& ok, bool add_to_scene) { // Open file @@ -185,14 +185,14 @@ Polyhedron_demo_c3t3_binary_io_plugin::load( return QList(); } -bool Polyhedron_demo_c3t3_binary_io_plugin::canSave(const CGAL::Three::Scene_item* item) +bool CGAL_Lab_c3t3_binary_io_plugin::canSave(const CGAL::Three::Scene_item* item) { // This plugin supports c3t3 items. return qobject_cast(item); } bool -Polyhedron_demo_c3t3_binary_io_plugin:: +CGAL_Lab_c3t3_binary_io_plugin:: save(QFileInfo fileinfo, QList &items) { Scene_item* item = items.front(); @@ -481,7 +481,7 @@ struct Update_cell_from_CDT_3 { }; // end struct Update_cell bool -Polyhedron_demo_c3t3_binary_io_plugin:: +CGAL_Lab_c3t3_binary_io_plugin:: try_load_a_cdt_3(std::istream& is, C3t3& c3t3) { std::cerr << "Try load a CDT_3..."; @@ -522,7 +522,7 @@ try_load_a_cdt_3(std::istream& is, C3t3& c3t3) } void -Polyhedron_demo_c3t3_binary_io_plugin:: +CGAL_Lab_c3t3_binary_io_plugin:: update_c3t3(C3t3& c3t3) { using Cell_handle = C3t3::Triangulation::Cell_handle; @@ -563,7 +563,7 @@ update_c3t3(C3t3& c3t3) //Generates a compilation error. bool -Polyhedron_demo_c3t3_binary_io_plugin:: +CGAL_Lab_c3t3_binary_io_plugin:: try_load_other_binary_format(std::istream& is, C3t3& c3t3) { CGAL::IO::set_ascii_mode(is); @@ -583,7 +583,7 @@ try_load_other_binary_format(std::istream& is, C3t3& c3t3) std::getline(is, s); if(s != "") { if(s != std::string(" ") + CGAL::Get_io_signature()()) { - std::cerr << "Polyhedron_demo_c3t3_binary_io_plugin::try_load_other_binary_format:" + std::cerr << "CGAL_Lab_c3t3_binary_io_plugin::try_load_other_binary_format:" << "\n expected format: " << CGAL::Get_io_signature()() << "\n got format:" << s << std::endl; return false; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_rib_exporter_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/C3t3_rib_exporter_plugin.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_rib_exporter_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/C3t3_rib_exporter_plugin.cpp index 8fbe68dfc4ea..21dc40ab0f08 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_rib_exporter_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/C3t3_rib_exporter_plugin.cpp @@ -6,8 +6,8 @@ #endif #include -#include -#include +#include +#include #include #include "Scene_c3t3_item.h" @@ -33,11 +33,11 @@ using namespace CGAL::Three; class C3t3_rib_exporter_plugin : public QObject, - protected Polyhedron_demo_plugin_helper + protected CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "c3t3_rib_exporter_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "c3t3_rib_exporter_plugin.json") public: C3t3_rib_exporter_plugin(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt b/Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt similarity index 90% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt index 2d3ac39315eb..de2ff090aee4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) remove_definitions(-DQT_STATICPLUGIN) @@ -8,7 +8,7 @@ qt6_wrap_cpp(VOLUME_MOC_OUTFILES ${CMAKE_CURRENT_SOURCE_DIR}/Volume_plane_interface.h) qt6_wrap_ui(meshingUI_FILES Meshing_dialog.ui Smoother_dialog.ui Local_optimizers_dialog.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( mesh_3_plugin Mesh_3_plugin Mesh_3_plugin_cgal_code.cpp @@ -59,7 +59,7 @@ endif() find_package(Boost QUIET OPTIONAL_COMPONENTS filesystem system) if(Boost_FILESYSTEM_FOUND) qt6_wrap_ui( imgUI_FILES Image_res_dialog.ui raw_image.ui) - polyhedron_demo_plugin(io_image_plugin Io_image_plugin + cgal_lab_plugin(io_image_plugin Io_image_plugin Volume_plane_intersection.cpp Raw_image_dialog.cpp ${imgUI_FILES} @@ -78,7 +78,7 @@ if(Boost_FILESYSTEM_FOUND) else() message(STATUS "NOTICE: the Io_image_plugin requires boost-filesystem, and will not be compiled") endif() -polyhedron_demo_plugin( +cgal_lab_plugin( mesh_3_optimization_plugin Optimization_plugin Optimization_plugin_cgal_code.cpp @@ -101,15 +101,15 @@ else() "A deprecated class will be used to replace it. Warnings are to be expected.") endif() -polyhedron_demo_plugin(c3t3_io_plugin C3t3_io_plugin KEYWORDS Viewer Mesh_3) +cgal_lab_plugin(c3t3_io_plugin C3t3_io_plugin KEYWORDS Viewer Mesh_3) target_link_libraries(c3t3_io_plugin PUBLIC scene_c3t3_item) qt6_wrap_ui(tetraUI_FILES Tetrahedra_filter_widget.ui) -polyhedron_demo_plugin(tetrahedra_filtering_plugin Tetrahedra_filtering_plugin ${tetraUI_FILES} KEYWORDS Mesh_3 Viewer) +cgal_lab_plugin(tetrahedra_filtering_plugin Tetrahedra_filtering_plugin ${tetraUI_FILES} KEYWORDS Mesh_3 Viewer) target_link_libraries(tetrahedra_filtering_plugin PUBLIC scene_c3t3_item scene_tetrahedra_item) qt6_wrap_ui(ribUI_FILES Rib_dialog.ui) -polyhedron_demo_plugin(c3t3_rib_exporter_plugin C3t3_rib_exporter_plugin +cgal_lab_plugin(c3t3_rib_exporter_plugin C3t3_rib_exporter_plugin ${ribUI_FILES} KEYWORDS Mesh_3) target_link_libraries(c3t3_rib_exporter_plugin PUBLIC scene_c3t3_item) @@ -121,7 +121,7 @@ if(TBB_FOUND) endif() qt6_wrap_ui(offsetMeshingUI_FILES Offset_meshing_dialog.ui) -polyhedron_demo_plugin(offset_meshing_plugin Offset_meshing_plugin +cgal_lab_plugin(offset_meshing_plugin Offset_meshing_plugin ${offsetMeshingUI_FILES}) target_link_libraries(offset_meshing_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Facet_extra_criterion.h b/Lab/demo/Lab/Plugins/Mesh_3/Facet_extra_criterion.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Facet_extra_criterion.h rename to Lab/demo/Lab/Plugins/Mesh_3/Facet_extra_criterion.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Image_res_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Image_res_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Image_res_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Image_res_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Io_image_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Io_image_plugin.cpp index 317e15e7dc78..4720d8aa35bd 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_image_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Io_image_plugin.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -48,7 +48,7 @@ #include #include #include "Raw_image_dialog.h" -#include +#include #ifdef CGAL_USE_VTK #include @@ -253,13 +253,13 @@ enum class Directory_extension_type class Io_image_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_helper, - public CGAL::Three::Polyhedron_demo_io_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_helper, + public CGAL::Three::CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90" FILE "io_image_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90" FILE "io_image_plugin.json") public: bool applicable(QAction*) const override @@ -267,7 +267,7 @@ class Io_image_plugin : return qobject_cast(scene->item(scene->mainSelectionIndex())); } - using Polyhedron_demo_io_plugin_interface::init; + using CGAL_Lab_io_plugin_interface::init; void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface *mi) override diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Io_implicit_function_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Io_implicit_function_plugin.cpp index 7f31055cf59c..6f554a4e2293 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Io_implicit_function_plugin.cpp @@ -16,8 +16,8 @@ //#include //#include -#include -#include +#include +#include #include "implicit_functions/Implicit_function_interface.h" #include "Scene_implicit_function_item.h" @@ -36,11 +36,11 @@ using namespace CGAL::Three; class Io_implicit_function_plugin : public QObject, - protected Polyhedron_demo_plugin_helper + protected CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: Io_implicit_function_plugin(); @@ -53,7 +53,7 @@ class Io_implicit_function_plugin : // bool canLoad() const { return false; } - typedef Polyhedron_demo_plugin_helper Plugin_helper; + typedef CGAL_Lab_plugin_helper Plugin_helper; using Plugin_helper::init; virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Local_optimizers_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Local_optimizers_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Local_optimizers_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Local_optimizers_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp index 47f220f6e589..02b9e63b12fc 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin.cpp @@ -1,8 +1,8 @@ #include "config.h" #include "config_mesh_3.h" -#ifdef CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER -#include +#ifdef CGAL_LAB_DEMO_USE_SURFACE_MESHER +#include #include #include #include "Messages_interface.h" @@ -60,11 +60,11 @@ Q_DECLARE_METATYPE(Protection_flags) class Mesh_3_plugin : public QObject, - protected Polyhedron_demo_plugin_interface + protected CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "mesh_3_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "mesh_3_plugin.json") Q_PROPERTY(double angle READ get_angle WRITE set_angle) Q_PROPERTY(double sharp_edges_angle_bound @@ -1090,4 +1090,4 @@ treat_result(Scene_item& source_item, #include "Mesh_3_plugin.moc" -#endif // CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#endif // CGAL_LAB_DEMO_USE_SURFACE_MESHER diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp index d48aef5bb1f9..7f3c06a0ba2e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.cpp @@ -512,6 +512,6 @@ Meshing_thread* cgal_code_mesh_3(const Image* pImage, #endif //CGAL_MESH_3_DEMO_ACTIVATE_SEGMENTED_IMAGES -//#include "Polyhedron_demo_mesh_3_plugin_cgal_code.moc" +//#include "CGAL_Lab_mesh_3_plugin_cgal_code.moc" //#include "Scene_c3t3_item.moc" //Check this one, it's strange moc include. diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h rename to Lab/demo/Lab/Plugins/Mesh_3/Mesh_3_plugin_cgal_code.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h b/Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_function.h rename to Lab/demo/Lab/Plugins/Mesh_3/Mesh_function.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Meshing_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Meshing_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_thread.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Meshing_thread.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_thread.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Meshing_thread.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_thread.h b/Lab/demo/Lab/Plugins/Mesh_3/Meshing_thread.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Meshing_thread.h rename to Lab/demo/Lab/Plugins/Mesh_3/Meshing_thread.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Offset_meshing_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Offset_meshing_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Offset_meshing_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Offset_meshing_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Offset_meshing_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Offset_meshing_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Offset_meshing_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Offset_meshing_plugin.cpp index d4a5dc15ffba..a6bee4c8a12d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Offset_meshing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Offset_meshing_plugin.cpp @@ -1,8 +1,8 @@ #include "config.h" -#ifdef CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#ifdef CGAL_LAB_DEMO_USE_SURFACE_MESHER -#include +#include #include "ui_Offset_meshing_dialog.h" #include "C3t3_type.h" @@ -414,13 +414,13 @@ struct Mesher_thread void resultReady(SMesh *offset_mesh); }; -class Polyhedron_demo_offset_meshing_plugin +class CGAL_Lab_offset_meshing_plugin : public QObject, - protected Polyhedron_demo_plugin_interface + protected CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: QAction* actionOffsetMeshing; @@ -500,10 +500,10 @@ class Polyhedron_demo_offset_meshing_plugin public Q_SLOTS: void offset_meshing(); void inflate_mesh(); -}; // class Polyhedron_demo_offset_meshing_plugin +}; // class CGAL_Lab_offset_meshing_plugin void -Polyhedron_demo_offset_meshing_plugin:: +CGAL_Lab_offset_meshing_plugin:: offset_meshing() { Scene_item* item = nullptr; @@ -712,7 +712,7 @@ offset_meshing() } void -Polyhedron_demo_offset_meshing_plugin:: +CGAL_Lab_offset_meshing_plugin:: inflate_mesh() { const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -762,4 +762,4 @@ inflate_mesh() #include "Offset_meshing_plugin.moc" -#endif // CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#endif // CGAL_LAB_DEMO_USE_SURFACE_MESHER diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Optimization_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Optimization_plugin.cpp index 6454a6f4cde2..07df7563414c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Optimization_plugin.cpp @@ -6,9 +6,9 @@ #include "config.h" #include "config_mesh_3.h" -#ifdef CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#ifdef CGAL_LAB_DEMO_USE_SURFACE_MESHER -#include +#include #include #include "Messages_interface.h" @@ -75,13 +75,13 @@ QString translate(CGAL::Mesh_optimization_return_code rc); using namespace CGAL::Three; class Mesh_3_optimization_plugin : public QObject, - protected Polyhedron_demo_plugin_interface + protected CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "optimization_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "optimization_plugin.json") - typedef Polyhedron_demo_plugin_interface Base; + typedef CGAL_Lab_plugin_interface Base; public: Mesh_3_optimization_plugin(); virtual void init(QMainWindow*, Scene_interface*, Messages_interface*); @@ -644,4 +644,4 @@ translate(CGAL::Mesh_optimization_return_code rc) #include "Optimization_plugin.moc" -#endif // CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#endif // CGAL_LAB_DEMO_USE_SURFACE_MESHER diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Optimization_plugin_cgal_code.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimizer_thread.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Optimizer_thread.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimizer_thread.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Optimizer_thread.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimizer_thread.h b/Lab/demo/Lab/Plugins/Mesh_3/Optimizer_thread.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimizer_thread.h rename to Lab/demo/Lab/Plugins/Mesh_3/Optimizer_thread.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Raw_image_dialog.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Raw_image_dialog.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Raw_image_dialog.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Raw_image_dialog.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Raw_image_dialog.h b/Lab/demo/Lab/Plugins/Mesh_3/Raw_image_dialog.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Raw_image_dialog.h rename to Lab/demo/Lab/Plugins/Mesh_3/Raw_image_dialog.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Rib_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Rib_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Rib_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Rib_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Smoother_dialog.ui b/Lab/demo/Lab/Plugins/Mesh_3/Smoother_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Smoother_dialog.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Smoother_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Tetrahedra_filter_widget.ui b/Lab/demo/Lab/Plugins/Mesh_3/Tetrahedra_filter_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Tetrahedra_filter_widget.ui rename to Lab/demo/Lab/Plugins/Mesh_3/Tetrahedra_filter_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Tetrahedra_filtering_plugin.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Tetrahedra_filtering_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Tetrahedra_filtering_plugin.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Tetrahedra_filtering_plugin.cpp index 9c8d9877f59d..a3cab77388c8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Tetrahedra_filtering_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Mesh_3/Tetrahedra_filtering_plugin.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -33,11 +33,11 @@ class DockWidget : class Q_DECL_EXPORT Tetrahedra_filtering_plugin: public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "tetrahedra_filtering_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "tetrahedra_filtering_plugin.json") public : void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*)override { diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane.h b/Lab/demo/Lab/Plugins/Mesh_3/Volume_plane.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane.h rename to Lab/demo/Lab/Plugins/Mesh_3/Volume_plane.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_interface.h b/Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_interface.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_interface.h rename to Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_interface.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_intersection.cpp b/Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_intersection.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_intersection.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_intersection.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_intersection.h b/Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_intersection.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_intersection.h rename to Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_intersection.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_thread.h b/Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_thread.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_plane_thread.h rename to Lab/demo/Lab/Plugins/Mesh_3/Volume_plane_thread.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h b/Lab/demo/Lab/Plugins/Mesh_3/config_mesh_3.h similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h rename to Lab/demo/Lab/Plugins/Mesh_3/config_mesh_3.h index 482e1f323fc8..d03fd13cc57f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/config_mesh_3.h +++ b/Lab/demo/Lab/Plugins/Mesh_3/config_mesh_3.h @@ -13,9 +13,9 @@ //#define CGAL_PROFILE -// #define CGAL_POLYHEDRON_DEMO_NO_NEF -// #define CGAL_POLYHEDRON_DEMO_NO_SURFACE_MESHER -// #define CGAL_POLYHEDRON_DEMO_NO_PARAMETRIZATION +// #define CGAL_LAB_DEMO_NO_NEF +// #define CGAL_LAB_DEMO_NO_SURFACE_MESHER +// #define CGAL_LAB_DEMO_NO_PARAMETRIZATION //#define CGAL_MESH_3_VERBOSE //#define CGAL_MESH_3_PERTURBER_HIGH_VERBOSITY @@ -26,16 +26,16 @@ //#define SHOW_REMAINING_BAD_ELEMENT_IN_RED -#ifndef CGAL_POLYHEDRON_DEMO_NO_PARAMETRIZATION -# define CGAL_POLYHEDRON_DEMO_USE_PARAMETRIZATION +#ifndef CGAL_LAB_DEMO_NO_PARAMETRIZATION +# define CGAL_LAB_DEMO_USE_PARAMETRIZATION #endif -#ifndef CGAL_POLYHEDRON_DEMO_NO_NEF -# define CGAL_POLYHEDRON_DEMO_USE_NEF +#ifndef CGAL_LAB_DEMO_NO_NEF +# define CGAL_LAB_DEMO_USE_NEF #endif -#ifndef CGAL_POLYHEDRON_DEMO_NO_SURFACE_MESHER -# define CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#ifndef CGAL_LAB_DEMO_NO_SURFACE_MESHER +# define CGAL_LAB_DEMO_USE_SURFACE_MESHER #endif //#define CGAL_MESH_3_DEMO_BIGGER_HISTOGRAM_WITH_WHITE_BACKGROUNG diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/include/gsl/gsl_assert b/Lab/demo/Lab/Plugins/Mesh_3/include/gsl/gsl_assert similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/include/gsl/gsl_assert rename to Lab/demo/Lab/Plugins/Mesh_3/include/gsl/gsl_assert diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/include/gsl/pointers b/Lab/demo/Lab/Plugins/Mesh_3/include/gsl/pointers similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/include/gsl/pointers rename to Lab/demo/Lab/Plugins/Mesh_3/include/gsl/pointers diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/raw_image.ui b/Lab/demo/Lab/Plugins/Mesh_3/raw_image.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/raw_image.ui rename to Lab/demo/Lab/Plugins/Mesh_3/raw_image.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/split_polylines.cpp b/Lab/demo/Lab/Plugins/Mesh_3/split_polylines.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/split_polylines.cpp rename to Lab/demo/Lab/Plugins/Mesh_3/split_polylines.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/split_polylines.h b/Lab/demo/Lab/Plugins/Mesh_3/split_polylines.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Mesh_3/split_polylines.h rename to Lab/demo/Lab/Plugins/Mesh_3/split_polylines.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp index fdbe540b33ed..e5fc1a20a4cf 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Animate_mesh_plugin.cpp @@ -11,7 +11,7 @@ #include "Scene_surface_mesh_item.h" #include #include -#include +#include #include #include "ui_Animate_widget.h" @@ -37,11 +37,11 @@ class DockWidget : class Q_DECL_EXPORT Animate_mesh_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_helper + public CGAL::Three::CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public : void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface, @@ -78,8 +78,8 @@ public : connect(dock_widget->helpButton, &QPushButton::clicked,this, [this](){ QMessageBox::information(dock_widget, QString("Animation"), QString("The TRJS format contains information for a succession of modifications on a Surface Mesh. " - "Such a modification is called a frame, and every frame is composed with a ligne for the " - "number of points modified, and one ligne per modified point and its index.\n\n" + "Such a modification is called a frame, and every frame is composed with a line for the " + "number of points modified, and one line per modified point and its index.\n\n" "Example:\n\n" "n \n" "id1 x1 y1 z1 \n" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Animate_widget.ui similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Animate_widget.ui index 3afb30392b00..4127220e6ff2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Animate_widget.ui +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Animate_widget.ui @@ -45,7 +45,7 @@ - + :/cgal/icons/resources/help_button.png:/cgal/icons/resources/help_button.png @@ -144,7 +144,7 @@ - + :/cgal/icons/resources/play.jpeg:/cgal/icons/resources/play.jpeg @@ -161,7 +161,7 @@ - + :/cgal/icons/resources/pause.jpeg:/cgal/icons/resources/pause.jpeg @@ -178,7 +178,7 @@ - + :/cgal/icons/resources/left_arrow.png:/cgal/icons/resources/left_arrow.png @@ -195,7 +195,7 @@ - + :/cgal/icons/resources/right_arrow.png:/cgal/icons/resources/right_arrow.png @@ -212,7 +212,7 @@ - + :/cgal/icons/resources/reset.jpg:/cgal/icons/resources/reset.jpg @@ -223,8 +223,8 @@ - - + + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/CMakeLists.txt similarity index 72% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/CMakeLists.txt index 8c27fa77cad8..81fc877f16bf 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/CMakeLists.txt @@ -1,35 +1,35 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) qt6_wrap_ui(clip_polyhedronUI_FILES Clip_polyhedron_plugin.ui) -polyhedron_demo_plugin(clip_polyhedron_plugin Clip_polyhedron_plugin +cgal_lab_plugin(clip_polyhedron_plugin Clip_polyhedron_plugin ${clip_polyhedronUI_FILES}) target_link_libraries( clip_polyhedron_plugin PUBLIC scene_surface_mesh_item scene_basic_objects scene_movable_sm_item) -polyhedron_demo_plugin(point_set_from_vertices_plugin +cgal_lab_plugin(point_set_from_vertices_plugin Point_set_from_vertices_plugin) target_link_libraries( point_set_from_vertices_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item scene_points_with_normal_item) -polyhedron_demo_plugin(point_set_from_sampling_plugin +cgal_lab_plugin(point_set_from_sampling_plugin Point_set_from_sampling_plugin) target_link_libraries( point_set_from_sampling_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item scene_points_with_normal_item) -polyhedron_demo_plugin(diff_between_meshes_plugin Diff_between_meshes_plugin) +cgal_lab_plugin(diff_between_meshes_plugin Diff_between_meshes_plugin) target_link_libraries(diff_between_meshes_plugin PUBLIC scene_surface_mesh_item) qt6_wrap_ui( animateUI_FILES Animate_widget.ui ) - polyhedron_demo_plugin(animate_mesh_plugin Animate_mesh_plugin ${animateUI_FILES}) + cgal_lab_plugin(animate_mesh_plugin Animate_mesh_plugin ${animateUI_FILES}) target_link_libraries(animate_mesh_plugin PUBLIC scene_surface_mesh_item) if( TARGET CGAL::METIS_support ) qt6_wrap_ui( partitionUI_FILES PartitionDialog.ui ) - polyhedron_demo_plugin(partition_plugin Partition_graph_plugin ${partitionUI_FILES}) + cgal_lab_plugin(partition_plugin Partition_graph_plugin ${partitionUI_FILES}) target_link_libraries(partition_plugin PUBLIC scene_surface_mesh_item CGAL::METIS_support ) else() message(STATUS "NOTICE: the Partition plugin needs METIS libraries and will not be compiled.") diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp index a78cd1150bae..b26e60c5d824 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include "Plugins/AABB_tree/Scene_movable_sm_item.h" @@ -77,13 +77,13 @@ class Scene_clipping_plane_item : public Scene_plane_item }; //end of class Scene_triangle_item -class Q_DECL_EXPORT Clip_polyhedron_plugin : +class Q_DECL_EXPORT Clip_cgal_lab_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public : // Adds an action to the menu and configures the widget void init(QMainWindow* mw, @@ -127,10 +127,10 @@ public : connect(actionClipPolyhedra , SIGNAL(triggered()), this, SLOT(pop_widget())); connect(ui_widget.clipButton, &QPushButton::clicked, - this, &Clip_polyhedron_plugin::clip); + this, &Clip_cgal_lab_plugin::clip); connect(actionStartClippingWithPoly, &QAction::triggered, - this, &Clip_polyhedron_plugin::start_clipping_with_poly); + this, &Clip_cgal_lab_plugin::start_clipping_with_poly); connect(ui_widget.helpButton, &QPushButton::clicked, [this](){ diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.ui b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.ui similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.ui rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.ui index 02fee88c1bd2..c69a0ac29f11 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.ui +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.ui @@ -48,7 +48,7 @@ - + :/cgal/icons/resources/help_button.png:/cgal/icons/resources/help_button.png @@ -187,8 +187,8 @@ Only available in Split mode. - - + + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Diff_between_meshes_plugin.cpp b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Diff_between_meshes_plugin.cpp similarity index 88% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Diff_between_meshes_plugin.cpp rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Diff_between_meshes_plugin.cpp index 8b0c4afe3854..907cd7fa16e5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Diff_between_meshes_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Diff_between_meshes_plugin.cpp @@ -10,20 +10,20 @@ #include #include -#include +#include #include #include #include #include "Messages_interface.h" using namespace CGAL::Three; -class Polyhedron_demo_diff_between_meshes_plugin : +class CGAL_Lab_diff_between_meshes_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, @@ -51,9 +51,9 @@ public Q_SLOTS: CGAL::Three::Scene_interface* scene; QAction* actionDiff; -}; // end Polyhedron_demo_diff_between_meshes_plugin +}; // end CGAL_Lab_diff_between_meshes_plugin -void Polyhedron_demo_diff_between_meshes_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_diff_between_meshes_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { @@ -64,12 +64,12 @@ void Polyhedron_demo_diff_between_meshes_plugin::init(QMainWindow* mainWindow, this, SLOT(diff())); } -QList Polyhedron_demo_diff_between_meshes_plugin::actions() const { +QList CGAL_Lab_diff_between_meshes_plugin::actions() const { return QList() << actionDiff; } -void Polyhedron_demo_diff_between_meshes_plugin::diff() +void CGAL_Lab_diff_between_meshes_plugin::diff() { typedef CGAL::Face_filtered_graph Filtered_graph; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/PartitionDialog.ui b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/PartitionDialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/PartitionDialog.ui rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/PartitionDialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp index cf7439cb97fb..c81f01c31db9 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Partition_graph_plugin.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "ui_PartitionDialog.h" #include "Color_map.h" @@ -35,11 +35,11 @@ class PartitionDialog : using namespace CGAL::Three; class Partition_graph_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: @@ -137,6 +137,6 @@ class Partition_graph_plugin : } -}; // end class Polyhedron_demo_affine_transform_plugin +}; // end class CGAL_Lab_affine_transform_plugin #include "Partition_graph_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp similarity index 88% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp index aa6ea4c1ba01..9419cba29a0b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Point_set_from_sampling_plugin.cpp @@ -12,20 +12,20 @@ #include "Scene_surface_mesh_item.h" #include "Scene_polygon_soup_item.h" -#include +#include #include "Messages_interface.h" #include #include using namespace CGAL::Three; -class Polyhedron_demo_point_set_from_sampling_plugin : +class CGAL_Lab_point_set_from_sampling_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, @@ -48,9 +48,9 @@ public Q_SLOTS: QAction* actionPointSetFromSampling; -}; // end Polyhedron_demo_point_set_from_sampling_plugin +}; // end CGAL_Lab_point_set_from_sampling_plugin -void Polyhedron_demo_point_set_from_sampling_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_point_set_from_sampling_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { @@ -61,13 +61,13 @@ void Polyhedron_demo_point_set_from_sampling_plugin::init(QMainWindow* mainWindo this, SLOT(createPointSet())); } -QList Polyhedron_demo_point_set_from_sampling_plugin::actions() const { +QList CGAL_Lab_point_set_from_sampling_plugin::actions() const { return QList() << actionPointSetFromSampling; } -void Polyhedron_demo_point_set_from_sampling_plugin::createPointSet() +void CGAL_Lab_point_set_from_sampling_plugin::createPointSet() { QApplication::setOverrideCursor(Qt::WaitCursor); const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp similarity index 80% rename from Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp rename to Lab/demo/Lab/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp index c57ec6e38f99..19ee1e3bccf8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp @@ -9,17 +9,17 @@ #include "Scene_surface_mesh_item.h" #include "Scene_polygon_soup_item.h" -#include +#include #include "Messages_interface.h" using namespace CGAL::Three; -class Polyhedron_demo_point_set_from_vertices_plugin : +class CGAL_Lab_point_set_from_vertices_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, @@ -43,9 +43,9 @@ public Q_SLOTS: template void apply(Item *item); -}; // end Polyhedron_demo_point_set_from_vertices_plugin +}; // end CGAL_Lab_point_set_from_vertices_plugin -void Polyhedron_demo_point_set_from_vertices_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_point_set_from_vertices_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { @@ -56,12 +56,12 @@ void Polyhedron_demo_point_set_from_vertices_plugin::init(QMainWindow* mainWindo this, SLOT(createPointSet())); } -QList Polyhedron_demo_point_set_from_vertices_plugin::actions() const { +QList CGAL_Lab_point_set_from_vertices_plugin::actions() const { return QList() << actionPointSetFromPolyhedronVertices; } template -void Polyhedron_demo_point_set_from_vertices_plugin::apply(Item *item) +void CGAL_Lab_point_set_from_vertices_plugin::apply(Item *item) { Scene_points_with_normal_item* points = new Scene_points_with_normal_item(*item->polyhedron()); @@ -73,7 +73,7 @@ void Polyhedron_demo_point_set_from_vertices_plugin::apply(Item *item) scene->addItem (points); } } -void Polyhedron_demo_point_set_from_vertices_plugin::createPointSet() +void CGAL_Lab_point_set_from_vertices_plugin::createPointSet() { QApplication::setOverrideCursor(Qt::WaitCursor); const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Affine_transform_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Affine_transform_plugin.cpp index d651bdcd61b6..0edc6f05f184 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Affine_transform_plugin.cpp @@ -9,7 +9,7 @@ #include "Scene_polygon_soup_item.h" #include "Scene_surface_mesh_item.h" -#include +#include #include #include #include @@ -49,13 +49,13 @@ class GridDialog } }; -class Polyhedron_demo_affine_transform_plugin +class CGAL_Lab_affine_transform_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") enum class Item_type { UNKNOWN, POINT_SET, POLYGON_SOUP, POLYGON_MESH }; using Generic_scene_aff_transformed_item = Scene_aff_transformed_item; // just for clarity @@ -137,17 +137,17 @@ class Polyhedron_demo_affine_transform_plugin ui.lineEditA->hide(); connect(ui.applyTransfo_Button, &QPushButton::clicked, - this, &Polyhedron_demo_affine_transform_plugin::applySingleTransformation); + this, &CGAL_Lab_affine_transform_plugin::applySingleTransformation); connect(ui.transfo_ComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSingleTransfoValues(int))); connect(ui.resetMatrix_Button, &QPushButton::clicked, - this, &Polyhedron_demo_affine_transform_plugin::resetTransformMatrix); + this, &CGAL_Lab_affine_transform_plugin::resetTransformMatrix); connect(ui.clearButton, &QPushButton::clicked, - this, &Polyhedron_demo_affine_transform_plugin::clear); + this, &CGAL_Lab_affine_transform_plugin::clear); connect(ui.undoButton, &QPushButton::clicked, - this, &Polyhedron_demo_affine_transform_plugin::undo); + this, &CGAL_Lab_affine_transform_plugin::undo); connect(ui.validatePushButton, &QPushButton::clicked, - this, &Polyhedron_demo_affine_transform_plugin::end); + this, &CGAL_Lab_affine_transform_plugin::end); std::fill(std::begin(scaling), std::end(scaling), 1.); std::fill(std::begin(lastScaling), std::end(lastScaling), 1.); @@ -223,7 +223,7 @@ public Q_SLOTS: }; void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: transformMatrix(double* res) const { QMatrix4x4 manipulatedMatrix, scalingMatrix; @@ -244,7 +244,7 @@ transformMatrix(double* res) const } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: updateUiMatrix() { if(!started()) @@ -291,7 +291,7 @@ updateUiMatrix() } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: resetTransformMatrix() { if(!started()) @@ -315,7 +315,7 @@ resetTransformMatrix() } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: updateSingleTransfoValues(int index) { ui.lineEditZ->setToolTip("Value along the z-axis."); @@ -353,7 +353,7 @@ updateSingleTransfoValues(int index) } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: applySingleTransformation() { if(!started()) @@ -418,7 +418,7 @@ applySingleTransformation() } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: normalize() { // Get the scale factor for the item's coordinates to be in [0..1] @@ -442,7 +442,7 @@ normalize() } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: generateItemGrid() { Scene_surface_mesh_item* item = qobject_cast(scene->item(scene->mainSelectionIndex())); @@ -522,7 +522,7 @@ generateItemGrid() template void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: start(SceneItem* item) { CGAL_precondition(item && !aff_transformed_item); @@ -551,7 +551,7 @@ start(SceneItem* item) aff_transformed_item->setName(tr("Affine Transformation")); connect(aff_transformed_item->manipulatedFrame(), &CGAL::qglviewer::ManipulatedFrame::modified, - this, &Polyhedron_demo_affine_transform_plugin::updateUiMatrix); + this, &CGAL_Lab_affine_transform_plugin::updateUiMatrix); connect(aff_transformed_item, SIGNAL(applyTransformation()), this, SLOT(transformItem())); @@ -559,13 +559,13 @@ start(SceneItem* item) connect(aff_transformed_item, &SceneTransformedItem::aboutToBeDestroyed, dockWidget, &QDockWidget::hide); connect(aff_transformed_item, &SceneTransformedItem::aboutToBeDestroyed, - this, &Polyhedron_demo_affine_transform_plugin::resetTransformedItem); + this, &CGAL_Lab_affine_transform_plugin::resetTransformedItem); connect(aff_transformed_item, &SceneTransformedItem::aboutToBeDestroyed, [](){ QApplication::restoreOverrideCursor(); }); // delete this transformed item if the item it was created for is deleted connect(item, &SceneItem::aboutToBeDestroyed, - this, &Polyhedron_demo_affine_transform_plugin::killTransformedItem); + this, &CGAL_Lab_affine_transform_plugin::killTransformedItem); Scene_interface::Item_id transformed_item_index = scene->addItem(aff_transformed_item); scene->setSelectedItem(transformed_item_index); @@ -574,7 +574,7 @@ start(SceneItem* item) } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: transformItem() { if(started()) @@ -606,7 +606,7 @@ transformItem() } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: endPointSet(const QMatrix4x4& transform_matrix) { Scene_aff_transformed_point_set_item* aff_transformed_pts_item = static_cast(aff_transformed_item); @@ -639,7 +639,7 @@ endPointSet(const QMatrix4x4& transform_matrix) } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: endPolygonSoup(const QMatrix4x4& transform_matrix) { Scene_aff_transformed_polygon_soup_item* aff_transformed_ps_item = static_cast(aff_transformed_item); @@ -668,7 +668,7 @@ endPolygonSoup(const QMatrix4x4& transform_matrix) } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: endPolygonMesh(const QMatrix4x4& transform_matrix) { Scene_aff_transformed_surface_mesh_item* aff_transformed_sm_item = static_cast(aff_transformed_item); @@ -695,7 +695,7 @@ endPolygonMesh(const QMatrix4x4& transform_matrix) } void -Polyhedron_demo_affine_transform_plugin:: +CGAL_Lab_affine_transform_plugin:: end() { ui.validatePushButton->setEnabled(false); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Basic_generator_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Basic_generator_plugin.cpp index 7c4b491ce0b2..3c4af7ce421c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Basic_generator_plugin.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "Scene_surface_mesh_item.h" @@ -58,11 +58,11 @@ namespace params = CGAL::parameters; class Q_DECL_EXPORT Basic_generator_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "basic_generator_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "basic_generator_plugin.json") public : void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, @@ -254,9 +254,9 @@ void Basic_generator_plugin::on_tab_changed() nb = nbs[PRISM]; QPixmap pic; if(dock_widget->prismCheckBox->isChecked()) - pic = QPixmap(":/cgal/Polyhedron_3/resources/prism.png"); + pic = QPixmap(":/cgal/Lab/resources/prism.png"); else - pic = QPixmap(":/cgal/Polyhedron_3/resources/prism-open.png"); + pic = QPixmap(":/cgal/Lab/resources/prism-open.png"); dock_widget->prism_picLabel->setPixmap(pic); dock_widget->prism_picLabel->show(); } @@ -272,9 +272,9 @@ void Basic_generator_plugin::on_tab_changed() nb = nbs[PYRAMID]; QPixmap pic; if(dock_widget->pyramidCheckBox->isChecked()) - pic = QPixmap(":/cgal/Polyhedron_3/resources/pyramid.png"); + pic = QPixmap(":/cgal/Lab/resources/pyramid.png"); else - pic = QPixmap(":/cgal/Polyhedron_3/resources/pyramid-open.png"); + pic = QPixmap(":/cgal/Lab/resources/pyramid-open.png"); dock_widget->pyramid_picLabel->setPixmap(pic); dock_widget->pyramid_picLabel->show(); } diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui b/Lab/demo/Lab/Plugins/PCA/Basic_generator_widget.ui similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui rename to Lab/demo/Lab/Plugins/PCA/Basic_generator_widget.ui index 03641b57a943..9593a39e3816 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_widget.ui +++ b/Lab/demo/Lab/Plugins/PCA/Basic_generator_widget.ui @@ -31,7 +31,7 @@ - :/cgal/Polyhedron_3/resources/prism.png + :/cgal/Lab/resources/prism.png false @@ -223,7 +223,7 @@ QGroupBox::title { - :/cgal/Polyhedron_3/resources/icosphere.png + :/cgal/Lab/resources/icosphere.png @@ -540,7 +540,7 @@ QGroupBox::title { - :/cgal/Polyhedron_3/resources/hexahedron.png + :/cgal/Lab/resources/hexahedron.png false @@ -750,7 +750,7 @@ QGroupBox::title { - :/cgal/Polyhedron_3/resources/tetrahedron.png + :/cgal/Lab/resources/tetrahedron.png @@ -910,7 +910,7 @@ li.checked::marker { content: "\2612"; } - :/cgal/Polyhedron_3/resources/grid.png + :/cgal/Lab/resources/grid.png @@ -1219,8 +1219,8 @@ li.checked::marker { content: "\2612"; } - - + + diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/CMakeLists.txt b/Lab/demo/Lab/Plugins/PCA/CMakeLists.txt similarity index 81% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/CMakeLists.txt rename to Lab/demo/Lab/Plugins/PCA/CMakeLists.txt index 5e73bc65730b..cb8939c8adaf 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/PCA/CMakeLists.txt @@ -1,12 +1,12 @@ -include(polyhedron_demo_macros) -polyhedron_demo_plugin(pca_plugin Pca_plugin KEYWORDS PointSetProcessing) +include(cgallab_macros) +cgal_lab_plugin(pca_plugin Pca_plugin KEYWORDS PointSetProcessing) target_link_libraries( pca_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item scene_basic_objects) qt6_wrap_ui(transformUI_FILES Transformation_widget.ui MeshOnGrid_dialog.ui) -polyhedron_demo_plugin(affine_transform_plugin Affine_transform_plugin +cgal_lab_plugin(affine_transform_plugin Affine_transform_plugin ${transformUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries(affine_transform_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item @@ -15,26 +15,26 @@ target_link_libraries(affine_transform_plugin PUBLIC scene_surface_mesh_item scene_aff_transformed_polygon_soup_item scene_aff_transformed_surface_mesh_item) -polyhedron_demo_plugin(edit_box_plugin Edit_box_plugin) +cgal_lab_plugin(edit_box_plugin Edit_box_plugin) target_link_libraries(edit_box_plugin PUBLIC scene_edit_box_item scene_surface_mesh_item) qt6_wrap_ui(clipUI_FILES Clipping_box_widget.ui) -polyhedron_demo_plugin(clipping_box_plugin Clipping_box_plugin ${clipUI_FILES}) +cgal_lab_plugin(clipping_box_plugin Clipping_box_plugin ${clipUI_FILES}) target_link_libraries(clipping_box_plugin PUBLIC scene_edit_box_item scene_basic_objects) -polyhedron_demo_plugin(create_bbox_mesh_plugin Create_bbox_mesh_plugin) +cgal_lab_plugin(create_bbox_mesh_plugin Create_bbox_mesh_plugin) target_link_libraries(create_bbox_mesh_plugin PUBLIC scene_surface_mesh_item) -polyhedron_demo_plugin(create_obb_mesh_plugin Create_obb_mesh_plugin) +cgal_lab_plugin(create_obb_mesh_plugin Create_obb_mesh_plugin) target_link_libraries(create_obb_mesh_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item scene_selection_item scene_points_with_normal_item) qt6_wrap_ui(volumesUI_FILES Basic_generator_widget.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( basic_generator_plugin Basic_generator_plugin ${volumesUI_FILES} KEYWORDS PolygonMesh PointSetProcessing) target_link_libraries( diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Clipping_box_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Clipping_box_plugin.cpp index 079100d1fb6f..38f753b9e3ec 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Clipping_box_plugin.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -34,11 +34,11 @@ class ClipWidget : using namespace CGAL::Three; class Clipping_box_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_widget.ui b/Lab/demo/Lab/Plugins/PCA/Clipping_box_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_widget.ui rename to Lab/demo/Lab/Plugins/PCA/Clipping_box_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Create_bbox_mesh_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Create_bbox_mesh_plugin.cpp index c624727032e8..cdeb6b6377fc 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Create_bbox_mesh_plugin.cpp @@ -11,17 +11,17 @@ #include #include "Scene_surface_mesh_item.h" -#include +#include using namespace CGAL::Three; class Create_bbox_mesh_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_obb_mesh_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Create_obb_mesh_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Create_obb_mesh_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Create_obb_mesh_plugin.cpp index cae392b0c943..6b2a7349cc6b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_obb_mesh_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Create_obb_mesh_plugin.cpp @@ -13,7 +13,7 @@ #include "Scene_polyhedron_selection_item.h" #include "Scene_points_with_normal_item.h" -#include +#include #include @@ -23,11 +23,11 @@ typedef Scene_surface_mesh_item Scene_facegraph_item; class Create_obb_mesh_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Edit_box_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Edit_box_plugin.cpp index dc96135c003d..38aafd820234 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Edit_box_plugin.cpp @@ -13,16 +13,16 @@ #include -#include +#include #include using namespace CGAL::Three; class Edit_box_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/MeshOnGrid_dialog.ui b/Lab/demo/Lab/Plugins/PCA/MeshOnGrid_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/MeshOnGrid_dialog.ui rename to Lab/demo/Lab/Plugins/PCA/MeshOnGrid_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp b/Lab/demo/Lab/Plugins/PCA/Pca_plugin.cpp similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp rename to Lab/demo/Lab/Plugins/PCA/Pca_plugin.cpp index 66331a4a6d24..86e7ec404bd8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PCA/Pca_plugin.cpp @@ -5,7 +5,7 @@ #include "Scene_points_with_normal_item.h" #include "Scene_plane_item.h" -#include +#include #include #include @@ -43,13 +43,13 @@ CGAL::Bbox_3 triangles(const TriangleMesh& mesh, using namespace CGAL::Three; -class Polyhedron_demo_pca_plugin : +class CGAL_Lab_pca_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: @@ -92,9 +92,9 @@ public Q_SLOTS: private: Scene_interface* scene; QList _actions; -}; // end Polyhedron_demo_pca_plugin +}; // end CGAL_Lab_pca_plugin -void Polyhedron_demo_pca_plugin::on_actionFitPlane_triggered() +void CGAL_Lab_pca_plugin::on_actionFitPlane_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -161,7 +161,7 @@ void Polyhedron_demo_pca_plugin::on_actionFitPlane_triggered() } } -void Polyhedron_demo_pca_plugin::on_actionFitLine_triggered() +void CGAL_Lab_pca_plugin::on_actionFitLine_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_item.cpp b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_item.cpp rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_item.h b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_item.h rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_item.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_point_set_item.cpp b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_point_set_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_point_set_item.cpp rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_point_set_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_point_set_item.h b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_point_set_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_point_set_item.h rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_point_set_item.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.cpp b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.cpp rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.h b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.h rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_polygon_soup_item.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.cpp b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.cpp rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.h b/Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.h rename to Lab/demo/Lab/Plugins/PCA/Scene_aff_transformed_surface_mesh_item.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp b/Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.cpp rename to Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.h b/Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item.h similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.h rename to Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item.h index 0d99b9ce08ed..9b00d3bda81e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item.h +++ b/Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item.h @@ -13,7 +13,7 @@ class SCENE_EDIT_BOX_ITEM_EXPORT Scene_edit_box_item: { Q_OBJECT Q_INTERFACES(CGAL::Three::Scene_transparent_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.TransparentInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.TransparentInterface/1.0") public: typedef CGAL::Simple_cartesian Kernel; struct vertex; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item_config.h b/Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Scene_edit_box_item_config.h rename to Lab/demo/Lab/Plugins/PCA/Scene_edit_box_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Transformation_widget.ui b/Lab/demo/Lab/Plugins/PCA/Transformation_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PCA/Transformation_widget.ui rename to Lab/demo/Lab/Plugins/PCA/Transformation_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/AddBboxDialog.ui b/Lab/demo/Lab/Plugins/PMP/AddBboxDialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/AddBboxDialog.ui rename to Lab/demo/Lab/Plugins/PMP/AddBboxDialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt similarity index 76% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt rename to Lab/demo/Lab/Plugins/PMP/CMakeLists.txt index 412126f18eac..d068b0a5c81f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt @@ -1,7 +1,7 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) if(TARGET CGAL::Eigen3_support) - polyhedron_demo_plugin(jet_fitting_plugin Jet_fitting_plugin) + cgal_lab_plugin(jet_fitting_plugin Jet_fitting_plugin) target_link_libraries( jet_fitting_plugin PUBLIC scene_surface_mesh_item scene_polylines_item CGAL::Eigen3_support) @@ -11,7 +11,7 @@ endif() if(TARGET CGAL::Eigen3_support) - polyhedron_demo_plugin(interpolated_corrected_principal_curvatures_plugin Interpolated_corrected_principal_curvatures_plugin) + cgal_lab_plugin(interpolated_corrected_principal_curvatures_plugin Interpolated_corrected_principal_curvatures_plugin) target_link_libraries( interpolated_corrected_principal_curvatures_plugin PUBLIC scene_surface_mesh_item scene_polylines_item CGAL::Eigen3_support) @@ -23,22 +23,22 @@ else() ) endif() -polyhedron_demo_plugin(extrude_plugin Extrude_plugin KEYWORDS PMP) +cgal_lab_plugin(extrude_plugin Extrude_plugin KEYWORDS PMP) target_link_libraries(extrude_plugin PUBLIC scene_surface_mesh_item scene_selection_item) if(TARGET CGAL::Eigen3_support) if("${EIGEN3_VERSION}" VERSION_GREATER "3.1.90") qt6_wrap_ui( hole_fillingUI_FILES Hole_filling_widget.ui) - polyhedron_demo_plugin(hole_filling_plugin Hole_filling_plugin ${hole_fillingUI_FILES} KEYWORDS PMP) + cgal_lab_plugin(hole_filling_plugin Hole_filling_plugin ${hole_fillingUI_FILES} KEYWORDS PMP) target_link_libraries(hole_filling_plugin PUBLIC scene_surface_mesh_item scene_polylines_item scene_selection_item CGAL::Eigen3_support) qt6_wrap_ui( fairingUI_FILES Fairing_widget.ui) - polyhedron_demo_plugin(fairing_plugin Fairing_plugin ${fairingUI_FILES} KEYWORDS PMP) + cgal_lab_plugin(fairing_plugin Fairing_plugin ${fairingUI_FILES} KEYWORDS PMP) target_link_libraries(fairing_plugin PUBLIC scene_selection_item CGAL::Eigen3_support) qt6_wrap_ui( Mean_curvature_flow_skeleton_pluginUI_FILES Mean_curvature_flow_skeleton_plugin.ui) - polyhedron_demo_plugin(mean_curvature_flow_skeleton_plugin Mean_curvature_flow_skeleton_plugin ${Mean_curvature_flow_skeleton_pluginUI_FILES}) + cgal_lab_plugin(mean_curvature_flow_skeleton_plugin Mean_curvature_flow_skeleton_plugin ${Mean_curvature_flow_skeleton_pluginUI_FILES}) target_link_libraries(mean_curvature_flow_skeleton_plugin PUBLIC scene_surface_mesh_item @@ -49,7 +49,7 @@ if(TARGET CGAL::Eigen3_support) CGAL::Eigen3_support) # The smoothing plugin can still do some things, even if Ceres is not found qt6_wrap_ui( smoothingUI_FILES Smoothing_plugin.ui Smoothing_tangential_relaxation.ui) - polyhedron_demo_plugin(smoothing_plugin Smoothing_plugin ${smoothingUI_FILES}) + cgal_lab_plugin(smoothing_plugin Smoothing_plugin ${smoothingUI_FILES}) target_link_libraries(smoothing_plugin PUBLIC scene_surface_mesh_item scene_selection_item CGAL::Eigen3_support) find_package(Ceres QUIET) include(CGAL_Ceres_support) @@ -64,7 +64,7 @@ if(TARGET CGAL::Eigen3_support) target_link_libraries(extrude_plugin PUBLIC CGAL::Eigen3_support) qt6_wrap_ui(remeshPlanarPatchesUI_FILES Remesh_planar_patches_dialog.ui) - polyhedron_demo_plugin(remesh_planar_patches_plugin Remesh_planar_patches_plugin + cgal_lab_plugin(remesh_planar_patches_plugin Remesh_planar_patches_plugin ${remeshPlanarPatchesUI_FILES} KEYWORDS PMP) target_link_libraries(remesh_planar_patches_plugin PUBLIC scene_surface_mesh_item CGAL::Eigen3_support) @@ -86,45 +86,45 @@ else() endif() qt6_wrap_ui(soupUI_FILES Repair_soup.ui) -polyhedron_demo_plugin(orient_soup_plugin Orient_soup_plugin ${soupUI_FILES} +cgal_lab_plugin(orient_soup_plugin Orient_soup_plugin ${soupUI_FILES} KEYWORDS Classification PMP) target_link_libraries( orient_soup_plugin PUBLIC scene_polygon_soup_item scene_surface_mesh_item scene_polylines_item scene_points_with_normal_item) -polyhedron_demo_plugin(inside_out_plugin Inside_out_plugin KEYWORDS PMP) +cgal_lab_plugin(inside_out_plugin Inside_out_plugin KEYWORDS PMP) target_link_libraries(inside_out_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item) -polyhedron_demo_plugin(join_and_split_plugin Join_and_split_polyhedra_plugin KEYWORDS PMP) +cgal_lab_plugin(join_and_split_plugin Join_and_split_polyhedra_plugin KEYWORDS PMP) target_link_libraries(join_and_split_plugin PUBLIC scene_surface_mesh_item scene_selection_item) qt6_wrap_ui( point_inside_polyhedronUI_FILES Point_inside_polyhedron_widget.ui) -polyhedron_demo_plugin(point_inside_polyhedron_plugin Point_inside_polyhedron_plugin ${point_inside_polyhedronUI_FILES}) +cgal_lab_plugin(point_inside_polyhedron_plugin Point_inside_polyhedron_plugin ${point_inside_polyhedronUI_FILES}) target_link_libraries(point_inside_polyhedron_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item) qt6_wrap_ui( polyhedron_slicerUI_FILES Polyhedron_slicer_widget.ui) -polyhedron_demo_plugin(polyhedron_slicer_plugin Polyhedron_slicer_plugin ${polyhedron_slicerUI_FILES}) +cgal_lab_plugin(polyhedron_slicer_plugin Polyhedron_slicer_plugin ${polyhedron_slicerUI_FILES}) target_link_libraries(polyhedron_slicer_plugin PUBLIC scene_surface_mesh_item scene_basic_objects scene_polylines_item) -polyhedron_demo_plugin(polyhedron_stitching_plugin Polyhedron_stitching_plugin KEYWORDS PMP) +cgal_lab_plugin(polyhedron_stitching_plugin Polyhedron_stitching_plugin KEYWORDS PMP) target_link_libraries(polyhedron_stitching_plugin PUBLIC scene_surface_mesh_item scene_polylines_item) qt6_wrap_ui( selectionUI_FILES Selection_widget.ui) -polyhedron_demo_plugin(selection_plugin Selection_plugin ${selectionUI_FILES} KEYWORDS PMP Viewer Classification Mesh_3) +cgal_lab_plugin(selection_plugin Selection_plugin ${selectionUI_FILES} KEYWORDS PMP Viewer Classification Mesh_3) target_link_libraries(selection_plugin PUBLIC scene_selection_item scene_points_with_normal_item scene_polylines_item) #to keep it simple to compile add_custom_target(self_intersection_plugin) add_dependencies(self_intersection_plugin selection_plugin) -polyhedron_demo_plugin(triangulate_facets_plugin Triangulate_facets_plugin KEYWORDS PMP) +cgal_lab_plugin(triangulate_facets_plugin Triangulate_facets_plugin KEYWORDS PMP) target_link_libraries(triangulate_facets_plugin PUBLIC scene_surface_mesh_item scene_selection_item scene_polygon_soup_item) -polyhedron_demo_plugin(corefinement_plugin Corefinement_plugin KEYWORDS PMP) +cgal_lab_plugin(corefinement_plugin Corefinement_plugin KEYWORDS PMP) target_link_libraries(corefinement_plugin PUBLIC scene_surface_mesh_item) -polyhedron_demo_plugin(surface_intersection_plugin Surface_intersection_plugin +cgal_lab_plugin(surface_intersection_plugin Surface_intersection_plugin KEYWORDS PMP) target_link_libraries( surface_intersection_plugin @@ -132,7 +132,7 @@ target_link_libraries( scene_points_with_normal_item) qt6_wrap_ui( repairUI_FILES RemoveNeedlesDialog.ui SelfSnapDialog.ui AddBboxDialog.ui) -polyhedron_demo_plugin(repair_polyhedron_plugin Repair_polyhedron_plugin ${repairUI_FILES} KEYWORDS PMP) +cgal_lab_plugin(repair_polyhedron_plugin Repair_polyhedron_plugin ${repairUI_FILES} KEYWORDS PMP) target_link_libraries(repair_polyhedron_plugin PUBLIC scene_points_with_normal_item scene_surface_mesh_item scene_polygon_soup_item) if(TARGET CGAL::TBB_support) target_link_libraries(repair_polyhedron_plugin PUBLIC CGAL::TBB_support) @@ -140,7 +140,7 @@ endif() if(TARGET CGAL::Eigen3_support) qt6_wrap_ui(isotropicRemeshingUI_FILES Isotropic_remeshing_dialog.ui) - polyhedron_demo_plugin(isotropic_remeshing_plugin Isotropic_remeshing_plugin + cgal_lab_plugin(isotropic_remeshing_plugin Isotropic_remeshing_plugin ${isotropicRemeshingUI_FILES} KEYWORDS PMP) target_link_libraries(isotropic_remeshing_plugin PUBLIC scene_surface_mesh_item scene_selection_item CGAL::Eigen3_support) @@ -153,29 +153,29 @@ else() message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Isotropic remeshing plugin will not be available.") endif() -polyhedron_demo_plugin(distance_plugin Distance_plugin KEYWORDS PMP) +cgal_lab_plugin(distance_plugin Distance_plugin KEYWORDS PMP) target_link_libraries(distance_plugin PUBLIC scene_surface_mesh_item scene_color_ramp) if(TARGET CGAL::TBB_support) target_link_libraries(distance_plugin PUBLIC CGAL::TBB_support) endif() -polyhedron_demo_plugin(detect_sharp_edges_plugin Detect_sharp_edges_plugin KEYWORDS Viewer Mesh_3 PMP) +cgal_lab_plugin(detect_sharp_edges_plugin Detect_sharp_edges_plugin KEYWORDS Viewer Mesh_3 PMP) target_link_libraries(detect_sharp_edges_plugin PUBLIC scene_surface_mesh_item) qt6_wrap_ui(randomPerturbationUI_FILES Random_perturbation_dialog.ui) -polyhedron_demo_plugin(random_perturbation_plugin Random_perturbation_plugin +cgal_lab_plugin(random_perturbation_plugin Random_perturbation_plugin ${randomPerturbationUI_FILES} KEYWORDS PMP) target_link_libraries(random_perturbation_plugin PUBLIC scene_surface_mesh_item scene_selection_item) -polyhedron_demo_plugin(degenerated_faces_plugin Degenerated_faces_plugin +cgal_lab_plugin(degenerated_faces_plugin Degenerated_faces_plugin KEYWORDS PMP) target_link_libraries(degenerated_faces_plugin PUBLIC scene_surface_mesh_item scene_selection_item) qt6_wrap_ui(engravUI_FILES Engrave_dock_widget.ui) -polyhedron_demo_plugin(engrave_text_plugin Engrave_text_plugin +cgal_lab_plugin(engrave_text_plugin Engrave_text_plugin ${engravUI_FILES}) target_link_libraries( engrave_text_plugin PUBLIC scene_surface_mesh_item scene_selection_item diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Corefinement_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Corefinement_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Corefinement_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Corefinement_plugin.cpp index 96636a12d51c..fd4d90b94fa9 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Corefinement_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Corefinement_plugin.cpp @@ -2,7 +2,7 @@ #include #include #include "Messages_interface.h" -#include +#include #include #include "Scene_surface_mesh_item.h" @@ -13,13 +13,13 @@ using namespace CGAL::Three; namespace PMP = CGAL::Polygon_mesh_processing; namespace params = CGAL::parameters; -class Polyhedron_demo_corefinement_sm_plugin : +class CGAL_Lab_corefinement_sm_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "corefinement_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "corefinement_plugin.json") enum bool_op {CRF_UNION, CRF_INTER, CRF_MINUS, CRF_MINUS_OP}; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Degenerated_faces_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Degenerated_faces_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Degenerated_faces_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Degenerated_faces_plugin.cpp index 7f490dc1f93c..802d0bfe509f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Degenerated_faces_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Degenerated_faces_plugin.cpp @@ -7,7 +7,7 @@ #include "Scene_surface_mesh_item.h" #include "Scene_polyhedron_selection_item.h" -#include +#include #include #include @@ -21,11 +21,11 @@ typedef Scene_facegraph_item::Face_graph Face_graph; using namespace CGAL::Three; class Degenerated_faces_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "degenerated_faces_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "degenerated_faces_plugin.json") public: diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Detect_sharp_edges_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Detect_sharp_edges_plugin.cpp similarity index 87% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Detect_sharp_edges_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Detect_sharp_edges_plugin.cpp index e8065f1ddb0b..4c288234aa8d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Detect_sharp_edges_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Detect_sharp_edges_plugin.cpp @@ -5,11 +5,11 @@ #include #include -#include +#include #include "Scene_surface_mesh_item.h" -#include "Polyhedron_demo_detect_sharp_edges.h" +#include "CGAL_Lab_detect_sharp_edges.h" typedef Scene_surface_mesh_item Scene_facegraph_item; typedef CGAL::Kernel_traits::Kernel Kernel; @@ -20,13 +20,13 @@ typedef boost::graph_traits::face_descriptor face_descriptor; using namespace CGAL::Three; -class Polyhedron_demo_detect_sharp_edges_plugin : +class CGAL_Lab_detect_sharp_edges_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "detect_sharp_edges_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "detect_sharp_edges_plugin.json") public: void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*) { @@ -66,15 +66,15 @@ public Q_SLOTS: QAction* actionSharEdges; CGAL::Three::Scene_interface* scene; QMainWindow* mw; -}; // end Polyhedron_demo_detect_sharp_edges_plugin +}; // end CGAL_Lab_detect_sharp_edges_plugin -void Polyhedron_demo_detect_sharp_edges_plugin::detectSharpEdgesWithInputDialog() +void CGAL_Lab_detect_sharp_edges_plugin::detectSharpEdgesWithInputDialog() { detectSharpEdges(true); } namespace PMP = CGAL::Polygon_mesh_processing; -void Polyhedron_demo_detect_sharp_edges_plugin::detectSharpEdges(bool input_dialog, +void CGAL_Lab_detect_sharp_edges_plugin::detectSharpEdges(bool input_dialog, double angle) { QApplication::setOverrideCursor(Qt::WaitCursor); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Distance_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Distance_plugin.cpp index 3034e7f58a3e..38fbd35c7cbf 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Distance_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Distance_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -344,11 +344,11 @@ class Scene_distance_polyhedron_item: public Scene_item_rendering_helper }; class DistancePlugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "distance_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "distance_plugin.json") typedef Kernel::Point_3 Point_3; public: diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_dock_widget.ui b/Lab/demo/Lab/Plugins/PMP/Engrave_dock_widget.ui similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_dock_widget.ui rename to Lab/demo/Lab/Plugins/PMP/Engrave_dock_widget.ui index a893a2561966..c09e56b7dd61 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_dock_widget.ui +++ b/Lab/demo/Lab/Plugins/PMP/Engrave_dock_widget.ui @@ -85,7 +85,7 @@ - + :/cgal/icons/resources/up.png:/cgal/icons/resources/up.png @@ -109,7 +109,7 @@ - + :/cgal/icons/resources/right_arrow.png:/cgal/icons/resources/right_arrow.png @@ -133,7 +133,7 @@ - + :/cgal/icons/resources/down.png:/cgal/icons/resources/down.png @@ -151,7 +151,7 @@ - + :/cgal/icons/resources/left_arrow.png:/cgal/icons/resources/left_arrow.png @@ -307,10 +307,10 @@ - - - - + + + + diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Engrave_text_plugin.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Engrave_text_plugin.cpp index 8c3048eaa3ff..b02afe6fb9f2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Engrave_text_plugin.cpp @@ -1,5 +1,5 @@ //General Plugin Data -#include +#include #include #include "ui_Engrave_dock_widget.h" @@ -296,11 +296,11 @@ class EngraveWidget : class Q_DECL_EXPORT Engrave_text_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: typedef CGAL::Surface_mesh_shortest_path_traits SP_traits; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Extrude_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Extrude_plugin.cpp index a2647094914c..538307e8e42f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Extrude_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -312,11 +312,11 @@ Vector estimate_normals(const std::vector& tris) class ExtrudePlugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "extrude_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "extrude_plugin.json") public: bool applicable(QAction* action) const override diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Fairing_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Fairing_plugin.cpp index ade3641a6fca..70c2398acf56 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Fairing_plugin.cpp @@ -2,7 +2,7 @@ #include #include "Messages_interface.h" -#include +#include #include #include "Scene_polyhedron_selection_item.h" #include "ui_Fairing_widget.h" @@ -32,13 +32,13 @@ typedef Scene_surface_mesh_item Scene_facegraph_item; typedef Scene_facegraph_item::Face_graph FaceGraph; using namespace CGAL::Three; -class Polyhedron_demo_fairing_plugin : +class CGAL_Lab_fairing_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "fairing_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "fairing_plugin.json") public: bool applicable(QAction*) const { return qobject_cast(scene->item(scene->mainSelectionIndex())) @@ -145,8 +145,8 @@ public Q_SLOTS: QDockWidget* dock_widget; Ui::Fairing ui_widget; -}; // end Polyhedron_demo_fairing_plugin +}; // end CGAL_Lab_fairing_plugin -// Q_EXPORT_PLUGIN2(Polyhedron_demo_fairing_plugin, Polyhedron_demo_fairing_plugin) +// Q_EXPORT_PLUGIN2(CGAL_Lab_fairing_plugin, CGAL_Lab_fairing_plugin) #include "Fairing_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_widget.ui b/Lab/demo/Lab/Plugins/PMP/Fairing_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_widget.ui rename to Lab/demo/Lab/Plugins/PMP/Fairing_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Hole_filling_plugin.cpp similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Hole_filling_plugin.cpp index 98399be1d54f..07371d079adb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Hole_filling_plugin.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include "ui_Hole_filling_widget.h" @@ -339,13 +339,13 @@ public Q_SLOTS: }; // end class Scene_hole_visualizer /////////////////////////////////////////////////////////////////////////////////////////////////// using namespace CGAL::Three; -class Polyhedron_demo_hole_filling_plugin : +class CGAL_Lab_hole_filling_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "hole_filling_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "hole_filling_plugin.json") public: bool applicable(QAction* action) const { @@ -455,9 +455,9 @@ public Q_SLOTS: "Use 'Visualize Holes' button to create one by selecting the polyhedron item!"; } -}; // end Polyhedron_demo_hole_filling_plugin +}; // end CGAL_Lab_hole_filling_plugin -void Polyhedron_demo_hole_filling_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_hole_filling_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { @@ -507,7 +507,7 @@ void Polyhedron_demo_hole_filling_plugin::init(QMainWindow* mainWindow, { connect(scene_casted, SIGNAL(itemAboutToBeDestroyed(CGAL::Three::Scene_item*)), this, SLOT(item_about_to_be_destroyed(CGAL::Three::Scene_item*))); } } -void Polyhedron_demo_hole_filling_plugin::item_about_to_be_destroyed(CGAL::Three::Scene_item* scene_item) { +void CGAL_Lab_hole_filling_plugin::item_about_to_be_destroyed(CGAL::Three::Scene_item* scene_item) { Scene_face_graph_item* poly_item = qobject_cast(scene_item); if(poly_item) { // erase assoc polylines item @@ -527,7 +527,7 @@ void Polyhedron_demo_hole_filling_plugin::item_about_to_be_destroyed(CGAL::Three } } // removes Scene_hole_visualizer items -void Polyhedron_demo_hole_filling_plugin::dock_widget_closed() { +void CGAL_Lab_hole_filling_plugin::dock_widget_closed() { // remove all Scene_hole_visualizer items for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) @@ -540,7 +540,7 @@ void Polyhedron_demo_hole_filling_plugin::dock_widget_closed() { on_Accept_button(); } // creates a Scene_hole_visualizer and associate it with active Scene_face_graph_item -void Polyhedron_demo_hole_filling_plugin::on_Visualize_holes_button() { +void CGAL_Lab_hole_filling_plugin::on_Visualize_holes_button() { Scene_face_graph_item* poly_item = getSelectedItem(); if(!poly_item) { print_message("Error: please select a polyhedron item from Geometric Objects list!"); @@ -570,7 +570,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Visualize_holes_button() { } } // fills selected holes on active Scene_hole_visualizer -void Polyhedron_demo_hole_filling_plugin::on_Fill_selected_holes_button() { +void CGAL_Lab_hole_filling_plugin::on_Fill_selected_holes_button() { // get active polylines item Scene_hole_visualizer* hole_visualizer = getSelectedItem(); if(!hole_visualizer) { @@ -602,7 +602,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Fill_selected_holes_button() { } // fills all holes and removes associated Scene_hole_visualizer if any -void Polyhedron_demo_hole_filling_plugin::on_Select_all_holes_button() { +void CGAL_Lab_hole_filling_plugin::on_Select_all_holes_button() { Scene_hole_visualizer* hole_visualizer = getSelectedItem(); if(!hole_visualizer) { print_message(no_selected_hole_visualizer_error_message()); @@ -611,7 +611,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Select_all_holes_button() { hole_visualizer->select_deselect_all(true); } -void Polyhedron_demo_hole_filling_plugin::on_Select_small_holes_button() { +void CGAL_Lab_hole_filling_plugin::on_Select_small_holes_button() { Scene_hole_visualizer* hole_visualizer = getSelectedItem(); if(!hole_visualizer) { print_message(no_selected_hole_visualizer_error_message()); @@ -629,7 +629,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Select_small_holes_button() { scene->itemChanged(hole_visualizer); } -void Polyhedron_demo_hole_filling_plugin::on_Deselect_all_holes_button() { +void CGAL_Lab_hole_filling_plugin::on_Deselect_all_holes_button() { Scene_hole_visualizer* hole_visualizer = getSelectedItem(); if(!hole_visualizer) { print_message(no_selected_hole_visualizer_error_message()); @@ -639,7 +639,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Deselect_all_holes_button() { } // Simply create polyline items and put them into scene - nothing related with other parts of the plugin -void Polyhedron_demo_hole_filling_plugin::on_Create_polyline_items_button(){ +void CGAL_Lab_hole_filling_plugin::on_Create_polyline_items_button(){ Scene_hole_visualizer* hole_visualizer = getSelectedItem(); if(!hole_visualizer) { print_message(no_selected_hole_visualizer_error_message()); @@ -658,7 +658,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Create_polyline_items_button(){ scene->addItem(polyline_item); } } -void Polyhedron_demo_hole_filling_plugin::on_Accept_button() { +void CGAL_Lab_hole_filling_plugin::on_Accept_button() { if(last_active_item == nullptr) { return; } accept_reject_toggle(false); @@ -668,7 +668,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Accept_button() { new_facets.clear(); last_active_item = nullptr; } -void Polyhedron_demo_hole_filling_plugin::on_Reject_button() { +void CGAL_Lab_hole_filling_plugin::on_Reject_button() { if(last_active_item == nullptr) { return; } accept_reject_toggle(false); @@ -682,7 +682,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Reject_button() { last_active_item = nullptr; } // To delete Scene_hole_visualizer when it becomes empty -void Polyhedron_demo_hole_filling_plugin::hole_visualizer_changed() { +void CGAL_Lab_hole_filling_plugin::hole_visualizer_changed() { Scene_hole_visualizer* hole_visualizer = qobject_cast(this->sender()); if(hole_visualizer && hole_visualizer->polyline_data_list.empty()) { scene->erase( scene->item_id(hole_visualizer)); @@ -690,7 +690,7 @@ void Polyhedron_demo_hole_filling_plugin::hole_visualizer_changed() { } } // helper function for filling holes -bool Polyhedron_demo_hole_filling_plugin::fill +bool CGAL_Lab_hole_filling_plugin::fill (Face_graph& poly, fg_halfedge_descriptor it) { int action_index = ui_widget.action_combo_box->currentIndex(); @@ -787,7 +787,7 @@ bool Polyhedron_demo_hole_filling_plugin::fill } // fills selected holes on active Scene_hole_visualizer -void Polyhedron_demo_hole_filling_plugin::on_Fill_from_selection_button() { +void CGAL_Lab_hole_filling_plugin::on_Fill_from_selection_button() { // get selection item Scene_polyhedron_selection_item* edge_selection = getSelectedItem(); if(!edge_selection || @@ -919,7 +919,7 @@ void Polyhedron_demo_hole_filling_plugin::on_Fill_from_selection_button() { edge_selection->polyhedron_item()->itemChanged(); } -void Polyhedron_demo_hole_filling_plugin::hole_filling_polyline_action() { +void CGAL_Lab_hole_filling_plugin::hole_filling_polyline_action() { Scene_polylines_item* polylines_item = qobject_cast(scene->item(scene->mainSelectionIndex())); if(!polylines_item) { print_message("Error: there is no selected polyline item!"); @@ -990,6 +990,6 @@ void Polyhedron_demo_hole_filling_plugin::hole_filling_polyline_action() { QApplication::restoreOverrideCursor(); } -// Q_EXPORT_PLUGIN2(Polyhedron_demo_hole_filling_plugin, Polyhedron_demo_hole_filling_plugin) +// Q_EXPORT_PLUGIN2(CGAL_Lab_hole_filling_plugin, CGAL_Lab_hole_filling_plugin) #include "Hole_filling_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_widget.ui b/Lab/demo/Lab/Plugins/PMP/Hole_filling_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_widget.ui rename to Lab/demo/Lab/Plugins/PMP/Hole_filling_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Inside_out_plugin.cpp similarity index 87% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Inside_out_plugin.cpp index 93633b3ab2a1..61ab9a4b0693 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Inside_out_plugin.cpp @@ -6,16 +6,16 @@ #include "Scene_polygon_soup_item.h" #include "Scene_surface_mesh_item.h" -#include +#include #include using namespace CGAL::Three; -class Polyhedron_demo_inside_out_plugin : +class CGAL_Lab_inside_out_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "inside_out_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "inside_out_plugin.json") public: @@ -63,9 +63,9 @@ public Q_SLOTS: QList _actions; Scene_interface *scene; QMainWindow* mw; -}; // end Polyhedron_demo_inside_out_plugin +}; // end CGAL_Lab_inside_out_plugin -void Polyhedron_demo_inside_out_plugin::on_actionInsideOut_triggered() +void CGAL_Lab_inside_out_plugin::on_actionInsideOut_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -98,7 +98,7 @@ void Polyhedron_demo_inside_out_plugin::on_actionInsideOut_triggered() } } -void Polyhedron_demo_inside_out_plugin::on_actionOrientCC_triggered() +void CGAL_Lab_inside_out_plugin::on_actionOrientCC_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp index 33250cf3e81a..4a75dfd7a3be 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Interpolated_corrected_principal_curvatures_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "Scene_surface_mesh_item.h" @@ -14,13 +14,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_interpolated_corrected_principal_curvatures_and_directions_plugin : +class CGAL_Lab_interpolated_corrected_principal_curvatures_and_directions_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: @@ -47,7 +47,7 @@ public Q_SLOTS: private : Scene_interface *scene; QList _actions; -}; // end Polyhedron_demo_interpolated_corrected_principal_curvatures_and_directions_plugin +}; // end CGAL_Lab_interpolated_corrected_principal_curvatures_and_directions_plugin void compute(SMesh* sMesh, @@ -127,7 +127,7 @@ void compute(SMesh* sMesh, } } -void Polyhedron_demo_interpolated_corrected_principal_curvatures_and_directions_plugin::on_actionEstimateCurvature_triggered() +void CGAL_Lab_interpolated_corrected_principal_curvatures_and_directions_plugin::on_actionEstimateCurvature_triggered() { // get active polyhedron const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_dialog.ui b/Lab/demo/Lab/Plugins/PMP/Isotropic_remeshing_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_dialog.ui rename to Lab/demo/Lab/Plugins/PMP/Isotropic_remeshing_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Isotropic_remeshing_plugin.cpp similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Isotropic_remeshing_plugin.cpp index 5140c35002f7..5001dd3e83c6 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Isotropic_remeshing_plugin.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include "Scene_surface_mesh_item.h" @@ -164,13 +164,13 @@ void split_long_duplicated_edge(const HedgeRange& hedge_range, } using namespace CGAL::Three; -class Polyhedron_demo_isotropic_remeshing_plugin : +class CGAL_Lab_isotropic_remeshing_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "isotropic_remeshing_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "isotropic_remeshing_plugin.json") typedef boost::graph_traits::edge_descriptor edge_descriptor; typedef boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1364,6 +1364,6 @@ public Q_SLOTS: private: QAction* actionIsotropicRemeshing_; Ui::Isotropic_remeshing_dialog ui; -}; // end Polyhedron_demo_isotropic_remeshing_plugin +}; // end CGAL_Lab_isotropic_remeshing_plugin #include "Isotropic_remeshing_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Jet_fitting_plugin.cpp similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Jet_fitting_plugin.cpp index 245e13ef210e..9bb1d326a03e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Jet_fitting_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Scene_surface_mesh_item.h" #include "Scene_polylines_item.h" @@ -11,13 +11,13 @@ #include #include using namespace CGAL::Three; -class Polyhedron_demo_jet_fitting_plugin : +class CGAL_Lab_jet_fitting_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: @@ -46,7 +46,7 @@ public Q_SLOTS: private : Scene_interface *scene; QList _actions; -}; // end Polyhedron_demo_jet_fitting_plugin +}; // end CGAL_Lab_jet_fitting_plugin template @@ -117,7 +117,7 @@ void compute(Poly* pMesh, } -void Polyhedron_demo_jet_fitting_plugin::on_actionEstimateCurvature_triggered() +void CGAL_Lab_jet_fitting_plugin::on_actionEstimateCurvature_triggered() { // get active polyhedron const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp index 2688c4a80346..c00934451b40 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp @@ -8,8 +8,8 @@ #include "Scene_polylines_item.h" #include "Messages_interface.h" -#include -#include +#include +#include #include #include @@ -27,13 +27,13 @@ typedef Scene_surface_mesh_item Scene_facegraph_item; typedef Scene_facegraph_item::Face_graph FaceGraph; using namespace CGAL::Three; -class Polyhedron_demo_join_and_split_polyhedra_plugin: +class CGAL_Lab_join_and_split_polyhedra_plugin: public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "join_and_split_polyhedra_plugin.json") - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "join_and_split_polyhedra_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) QAction* actionJoinPolyhedra, *actionSplitPolyhedra, *actionColorConnectedComponents; Messages_interface* msg_interface; public: @@ -80,9 +80,9 @@ public Q_SLOTS: private : CGAL::Three::Scene_interface* scene; -}; // end Polyhedron_demo_polyhedron_stitching_plugin +}; // end CGAL_Lab_polyhedron_stitching_plugin -void Polyhedron_demo_join_and_split_polyhedra_plugin::on_actionJoinPolyhedra_triggered() +void CGAL_Lab_join_and_split_polyhedra_plugin::on_actionJoinPolyhedra_triggered() { CGAL::Three::Scene_interface::Item_id mainSelectionIndex = scene->selectionIndices().first(); @@ -135,7 +135,7 @@ bool operator()(const FaceGraph& mesh1, const FaceGraph& mesh2) } }; -void Polyhedron_demo_join_and_split_polyhedra_plugin::on_actionSplitPolyhedra_triggered() +void CGAL_Lab_join_and_split_polyhedra_plugin::on_actionSplitPolyhedra_triggered() { for(int index : scene->selectionIndices()) { Scene_facegraph_item* item = @@ -195,7 +195,7 @@ struct Polyhedron_cc_marker{ } }; -void Polyhedron_demo_join_and_split_polyhedra_plugin::on_actionColorConnectedComponents_triggered() +void CGAL_Lab_join_and_split_polyhedra_plugin::on_actionColorConnectedComponents_triggered() { // wait cursor diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp index 81bd34ee9978..7c333459555a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "ui_Mean_curvature_flow_skeleton_plugin.h" @@ -79,19 +79,19 @@ struct Polyline_visitor }; using namespace CGAL::Three; -class Polyhedron_demo_mean_curvature_flow_skeleton_plugin : +class CGAL_Lab_mean_curvature_flow_skeleton_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionMCFSkeleton; QAction* actionConvert_to_medial_skeleton; public: - ~Polyhedron_demo_mean_curvature_flow_skeleton_plugin() + ~CGAL_Lab_mean_curvature_flow_skeleton_plugin() { delete ui; } @@ -317,9 +317,9 @@ public Q_SLOTS: QDockWidget* dockWidget = nullptr; Ui::Mean_curvature_flow_skeleton_plugin* ui = nullptr; -}; // end Polyhedron_demo_mean_curvature_flow_skeleton_plugin +}; // end CGAL_Lab_mean_curvature_flow_skeleton_plugin -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionMCFSkeleton_triggered() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionMCFSkeleton_triggered() { dockWidget->show(); dockWidget->raise(); @@ -328,19 +328,19 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionMCFSkeleton_t getMCFItem(); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_checkbox_toggled(bool b) +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_checkbox_toggled(bool b) { ui->omega_P->setEnabled(b); ui->label_omega_P->setEnabled(b); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionUpdateBBox(bool) +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionUpdateBBox(bool) { double diag = scene->len_diagonal(); ui->min_edge_length->setValue(0.002 * diag); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSegment() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionSegment() { Scene_mcf_item* item = getMCFItem(); @@ -431,7 +431,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSegment() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConvert_to_medial_skeleton_triggered() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionConvert_to_medial_skeleton_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -473,7 +473,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConvert_to_me } } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionContract() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionContract() { Scene_mcf_item* item = getMCFItem(); @@ -497,7 +497,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionContract() scene->setSelectedItem(scene->item_id(item)); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionCollapse() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionCollapse() { Scene_mcf_item* item = getMCFItem(); @@ -523,7 +523,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionCollapse() scene->setSelectedItem(scene->item_id(item)); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSplit() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionSplit() { Scene_mcf_item* item = getMCFItem(); @@ -549,7 +549,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSplit() scene->setSelectedItem(scene->item_id(item)); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionDegeneracy() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionDegeneracy() { Scene_mcf_item* item = getMCFItem(); @@ -600,7 +600,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionDegeneracy() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionRun() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionRun() { Scene_mcf_item* item = getMCFItem(); @@ -723,7 +723,7 @@ if(!contracted_item) QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSkeletonize() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionSkeletonize() { Scene_mcf_item* item = getMCFItem(); @@ -784,7 +784,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionSkeletonize() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConverge() +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionConverge() { Scene_mcf_item* item = getMCFItem(); @@ -836,7 +836,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionConverge() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionItemAboutToBeDestroyed(CGAL::Three::Scene_item* corpse ) +void CGAL_Lab_mean_curvature_flow_skeleton_plugin::on_actionItemAboutToBeDestroyed(CGAL::Three::Scene_item* corpse ) { Scene_mcf_item *mcf= qobject_cast(corpse); @@ -856,7 +856,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionItemAboutToBe } void -Polyhedron_demo_mean_curvature_flow_skeleton_plugin::createContractedItem(Scene_mcf_item* item) +CGAL_Lab_mean_curvature_flow_skeleton_plugin::createContractedItem(Scene_mcf_item* item) { if(!item) return; @@ -889,7 +889,7 @@ Polyhedron_demo_mean_curvature_flow_skeleton_plugin::createContractedItem(Scene_ } Scene_mcf_item* -Polyhedron_demo_mean_curvature_flow_skeleton_plugin::getMCFItem() +CGAL_Lab_mean_curvature_flow_skeleton_plugin::getMCFItem() { for(int index : scene->selectionIndices()) { diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.ui b/Lab/demo/Lab/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.ui rename to Lab/demo/Lab/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Orient_soup_plugin.cpp similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Orient_soup_plugin.cpp index de23c0ac471c..a03361566320 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Orient_soup_plugin.cpp @@ -13,7 +13,7 @@ #include "Scene_surface_mesh_item.h" #include "Scene_points_with_normal_item.h" -#include +#include #include #include @@ -21,13 +21,13 @@ #include "Messages_interface.h" #include "ui_Repair_soup.h" using namespace CGAL::Three; -class Polyhedron_demo_orient_soup_plugin : +class CGAL_Lab_orient_soup_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "orient_soup_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "orient_soup_plugin.json") public: void init(QMainWindow* mainWindow, @@ -69,9 +69,9 @@ public Q_SLOTS: QAction* actionDisplayNonManifoldEdges; QAction* actionClean; -}; // end Polyhedron_demo_orient_soup_plugin +}; // end CGAL_Lab_orient_soup_plugin -void Polyhedron_demo_orient_soup_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_orient_soup_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { @@ -98,10 +98,10 @@ void Polyhedron_demo_orient_soup_plugin::init(QMainWindow* mainWindow, actionClean = new QAction(tr("Clean Polygon Soup"), mainWindow); actionClean->setProperty("subMenuName", "Polygon Mesh Processing"); connect(actionClean, &QAction::triggered, - this, &Polyhedron_demo_orient_soup_plugin::cleanSoup); + this, &CGAL_Lab_orient_soup_plugin::cleanSoup); } -QList Polyhedron_demo_orient_soup_plugin::actions() const { +QList CGAL_Lab_orient_soup_plugin::actions() const { return QList() << actionOrientSM << actionShuffle @@ -137,7 +137,7 @@ void set_fcolors(SMesh* smesh, std::vector colors) fcolors[fd] = colors[color_id++]; } -void Polyhedron_demo_orient_soup_plugin::orientSM() +void CGAL_Lab_orient_soup_plugin::orientSM() { for(CGAL::Three::Scene_interface::Item_id index : scene->selectionIndices()) { @@ -186,7 +186,7 @@ void Polyhedron_demo_orient_soup_plugin::orientSM() } } -void Polyhedron_demo_orient_soup_plugin::shuffle() +void CGAL_Lab_orient_soup_plugin::shuffle() { for(CGAL::Three::Scene_interface::Item_id index : scene->selectionIndices()) { @@ -208,7 +208,7 @@ void Polyhedron_demo_orient_soup_plugin::shuffle() } template -void Polyhedron_demo_orient_soup_plugin::apply_shuffle( Item* root_item, +void CGAL_Lab_orient_soup_plugin::apply_shuffle( Item* root_item, const CGAL::Three::Scene_interface::Item_id& index) { QApplication::setOverrideCursor(Qt::WaitCursor); @@ -225,7 +225,7 @@ void Polyhedron_demo_orient_soup_plugin::apply_shuffle( Item* root_item, QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_orient_soup_plugin::displayNonManifoldEdges() +void CGAL_Lab_orient_soup_plugin::displayNonManifoldEdges() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -241,7 +241,7 @@ void Polyhedron_demo_orient_soup_plugin::displayNonManifoldEdges() } } //todo: nm-points should probably be a pair, and the removal check be on both members -void Polyhedron_demo_orient_soup_plugin::createPointsAndPolyline(std::vector& nm_points, bool warn) +void CGAL_Lab_orient_soup_plugin::createPointsAndPolyline(std::vector& nm_points, bool warn) { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -316,7 +316,7 @@ class RepairDialog : } }; -void Polyhedron_demo_orient_soup_plugin::cleanSoup() +void CGAL_Lab_orient_soup_plugin::cleanSoup() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Point_inside_polyhedron_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Point_inside_polyhedron_plugin.cpp index 61e15f68eb32..5474f99979a4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Point_inside_polyhedron_plugin.cpp @@ -6,7 +6,7 @@ #include "Scene_points_with_normal_item.h" #include #include -#include +#include #include #include @@ -31,13 +31,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic_kernel; -class Polyhedron_demo_point_inside_polyhedron_plugin : +class CGAL_Lab_point_inside_cgal_lab_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: bool applicable(QAction*) const @@ -267,6 +267,6 @@ private Q_SLOTS: QDockWidget* dock_widget; Ui::Point_inside_polyhedron ui_widget; -}; // end Polyhedron_demo_point_inside_polyhedron_plugin +}; // end CGAL_Lab_point_inside_cgal_lab_plugin #include "Point_inside_polyhedron_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_widget.ui b/Lab/demo/Lab/Plugins/PMP/Point_inside_polyhedron_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_widget.ui rename to Lab/demo/Lab/Plugins/PMP/Point_inside_polyhedron_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Polyhedron_slicer_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Polyhedron_slicer_plugin.cpp index a220547b7223..59033b835bf5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Polyhedron_slicer_plugin.cpp @@ -8,7 +8,7 @@ #include "Scene_polylines_item.h" #include "Scene.h" -#include +#include #include #include "ui_Polyhedron_slicer_widget.h" @@ -27,13 +27,13 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic_kernel; using namespace CGAL::Three; -class Polyhedron_demo_polyhedron_slicer_plugin : +class CGAL_Lab_polyhedron_slicer_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: bool applicable(QAction*) const @@ -93,9 +93,9 @@ public Q_SLOTS: const std::vector& plane_positions, std::list >& polylines); -}; // end Polyhedron_demo_polyhedron_slicer_plugin +}; // end CGAL_Lab_polyhedron_slicer_plugin -void Polyhedron_demo_polyhedron_slicer_plugin::init(QMainWindow* mainWindow, +void CGAL_Lab_polyhedron_slicer_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { @@ -119,11 +119,11 @@ void Polyhedron_demo_polyhedron_slicer_plugin::init(QMainWindow* mainWindow, connect(ui_widget.Update_plane_button, SIGNAL(clicked()), this, SLOT(on_Update_plane_button_clicked())); } -QList Polyhedron_demo_polyhedron_slicer_plugin::actions() const { +QList CGAL_Lab_polyhedron_slicer_plugin::actions() const { return QList() << actionSlicerWidget; } -void Polyhedron_demo_polyhedron_slicer_plugin::slicer_widget_action(){ +void CGAL_Lab_polyhedron_slicer_plugin::slicer_widget_action(){ if(dock_widget->isVisible()) { return; } dock_widget->show(); dock_widget->raise(); @@ -156,7 +156,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::slicer_widget_action(){ } // when manipulated frame of plane is modified, update line-edits -void Polyhedron_demo_polyhedron_slicer_plugin::plane_manipulated_frame_modified() { +void CGAL_Lab_polyhedron_slicer_plugin::plane_manipulated_frame_modified() { CGAL::qglviewer::ManipulatedFrame* mf = plane_item->manipulatedFrame(); const CGAL::qglviewer::Vec& pos = mf->position(); ui_widget.Center_x->setText(QString::number(pos.x)); @@ -176,7 +176,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::plane_manipulated_frame_modified( } // when Update Plane button is clicked, update manipulated frame of plane with line-edits -bool Polyhedron_demo_polyhedron_slicer_plugin::on_Update_plane_button_clicked() { +bool CGAL_Lab_polyhedron_slicer_plugin::on_Update_plane_button_clicked() { CGAL::qglviewer::ManipulatedFrame* mf = plane_item->manipulatedFrame(); // get center bool ok_1 = true, ok_2 = true, ok_3 = true; @@ -215,7 +215,7 @@ bool Polyhedron_demo_polyhedron_slicer_plugin::on_Update_plane_button_clicked() } // generate multiple cuts, until any cut does not intersect with bbox -void Polyhedron_demo_polyhedron_slicer_plugin::on_Generate_button_clicked() +void CGAL_Lab_polyhedron_slicer_plugin::on_Generate_button_clicked() { Scene_surface_mesh_item* sm_item = getSelectedItem(); if(! sm_item) { @@ -324,7 +324,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::on_Generate_button_clicked() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_polyhedron_slicer_plugin::item_about_to_be_destroyed(CGAL::Three::Scene_item* scene_item) { +void CGAL_Lab_polyhedron_slicer_plugin::item_about_to_be_destroyed(CGAL::Three::Scene_item* scene_item) { if(plane_item == nullptr) { return; }// which means this plugin erased plane_item Scene_plane_item* destroyed_plane = qobject_cast(scene_item); if(destroyed_plane && destroyed_plane == plane_item) { @@ -333,7 +333,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::item_about_to_be_destroyed(CGAL:: } } -void Polyhedron_demo_polyhedron_slicer_plugin::dock_widget_closed() { +void CGAL_Lab_polyhedron_slicer_plugin::dock_widget_closed() { CGAL_assertion(plane_item != NULL); CGAL::Three::Scene_interface::Item_id id = scene->item_id(plane_item); plane_item = nullptr; @@ -341,7 +341,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::dock_widget_closed() { } // this function assumes 'planes' are parallel template -void Polyhedron_demo_polyhedron_slicer_plugin::intersection_of_plane_Polyhedra_3_using_AABB_wrapper( +void CGAL_Lab_polyhedron_slicer_plugin::intersection_of_plane_Polyhedra_3_using_AABB_wrapper( TriangleMesh& poly, const std::vector& planes, const std::vector& plane_positions, diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_widget.ui b/Lab/demo/Lab/Plugins/PMP/Polyhedron_slicer_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_widget.ui rename to Lab/demo/Lab/Plugins/PMP/Polyhedron_slicer_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Polyhedron_stitching_plugin.cpp similarity index 80% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Polyhedron_stitching_plugin.cpp index 6bedf046e855..fd4a38b9075a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Polyhedron_stitching_plugin.cpp @@ -5,8 +5,8 @@ #include "Scene_surface_mesh_item.h" #include "Scene_polylines_item.h" -#include -#include +#include +#include #include #include @@ -16,13 +16,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_polyhedron_stitching_plugin : +class CGAL_Lab_polyhedron_stitching_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "polyhedron_stitching_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "polyhedron_stitching_plugin.json") QAction* actionDetectBorders; QAction* actionStitchBorders; @@ -78,12 +78,12 @@ public Q_SLOTS: void on_actionStitchByCC_triggered(); void on_actionMergeReversibleCCs_triggered(); -}; // end Polyhedron_demo_polyhedron_stitching_plugin +}; // end CGAL_Lab_polyhedron_stitching_plugin template -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionDetectBorders_triggered(Scene_interface::Item_id index) +void CGAL_Lab_polyhedron_stitching_plugin::on_actionDetectBorders_triggered(Scene_interface::Item_id index) { typedef typename Item::Face_graph FaceGraph; Item* item = qobject_cast(scene->item(index)); @@ -118,7 +118,7 @@ void Polyhedron_demo_polyhedron_stitching_plugin::on_actionDetectBorders_trigger } } -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionDetectBorders_triggered() +void CGAL_Lab_polyhedron_stitching_plugin::on_actionDetectBorders_triggered() { for(int index : scene->selectionIndices()){ on_actionDetectBorders_triggered(index); @@ -126,7 +126,7 @@ void Polyhedron_demo_polyhedron_stitching_plugin::on_actionDetectBorders_trigger } template -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchBorders_triggered(Scene_interface::Item_id index) +void CGAL_Lab_polyhedron_stitching_plugin::on_actionStitchBorders_triggered(Scene_interface::Item_id index) { Item* item = qobject_cast(scene->item(index)); @@ -140,7 +140,7 @@ void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchBorders_trigger } -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchBorders_triggered() +void CGAL_Lab_polyhedron_stitching_plugin::on_actionStitchBorders_triggered() { for(int index : scene->selectionIndices()){ on_actionStitchBorders_triggered(index); @@ -148,7 +148,7 @@ void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchBorders_trigger } template -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchByCC_triggered(Scene_interface::Item_id index) +void CGAL_Lab_polyhedron_stitching_plugin::on_actionStitchByCC_triggered(Scene_interface::Item_id index) { Item* item = qobject_cast(scene->item(index)); @@ -162,7 +162,7 @@ void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchByCC_triggered( } template -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionMergeReversibleCCs_triggered(Scene_interface::Item_id index) +void CGAL_Lab_polyhedron_stitching_plugin::on_actionMergeReversibleCCs_triggered(Scene_interface::Item_id index) { Item* item = qobject_cast(scene->item(index)); @@ -175,14 +175,14 @@ void Polyhedron_demo_polyhedron_stitching_plugin::on_actionMergeReversibleCCs_tr scene->itemChanged(item); } -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionStitchByCC_triggered() +void CGAL_Lab_polyhedron_stitching_plugin::on_actionStitchByCC_triggered() { for(int index : scene->selectionIndices()){ on_actionStitchByCC_triggered(index); } } -void Polyhedron_demo_polyhedron_stitching_plugin::on_actionMergeReversibleCCs_triggered() +void CGAL_Lab_polyhedron_stitching_plugin::on_actionMergeReversibleCCs_triggered() { for(int index : scene->selectionIndices()){ on_actionMergeReversibleCCs_triggered(index); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Random_perturbation_dialog.ui b/Lab/demo/Lab/Plugins/PMP/Random_perturbation_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Random_perturbation_dialog.ui rename to Lab/demo/Lab/Plugins/PMP/Random_perturbation_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Random_perturbation_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Random_perturbation_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Random_perturbation_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Random_perturbation_plugin.cpp index 004768739cd5..d43ef36b3d6c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Random_perturbation_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Random_perturbation_plugin.cpp @@ -1,7 +1,7 @@ #include -#include +#include #include "Scene_surface_mesh_item.h" #include "Scene_polyhedron_selection_item.h" @@ -27,13 +27,13 @@ #include "ui_Random_perturbation_dialog.h" using namespace CGAL::Three; -class Polyhedron_demo_random_perturbation_plugin : +class CGAL_Lab_random_perturbation_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "random_perturbation_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "random_perturbation_plugin.json") public: void init(QMainWindow* mainWindow, @@ -228,7 +228,7 @@ public Q_SLOTS: QMainWindow* mw; QAction* actionRandomPerturbation_; -}; // end Polyhedron_demo_random_perturbation_plugin +}; // end CGAL_Lab_random_perturbation_plugin #include "Random_perturbation_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Remesh_planar_patches_dialog.ui b/Lab/demo/Lab/Plugins/PMP/Remesh_planar_patches_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Remesh_planar_patches_dialog.ui rename to Lab/demo/Lab/Plugins/PMP/Remesh_planar_patches_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Remesh_planar_patches_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Remesh_planar_patches_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Remesh_planar_patches_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Remesh_planar_patches_plugin.cpp index 067f2c8fe721..497978446776 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Remesh_planar_patches_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Remesh_planar_patches_plugin.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "Scene_surface_mesh_item.h" @@ -51,13 +51,13 @@ struct Mesh_map }; using namespace CGAL::Three; -class Polyhedron_demo_remesh_planar_patches_plugin : +class CGAL_Lab_remesh_planar_patches_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "isotropic_remeshing_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "isotropic_remeshing_plugin.json") typedef Scene_surface_mesh_item::Face_graph Mesh; typedef boost::graph_traits::face_descriptor face_descriptor; @@ -322,6 +322,6 @@ public Q_SLOTS: QAction* actionRemeshPlanarPatches_; Ui::Remesh_planar_patches_dialog ui; -}; // end Polyhedron_demo_remesh_planar_patches_plugin +}; // end CGAL_Lab_remesh_planar_patches_plugin #include "Remesh_planar_patches_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/RemoveNeedlesDialog.ui b/Lab/demo/Lab/Plugins/PMP/RemoveNeedlesDialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/RemoveNeedlesDialog.ui rename to Lab/demo/Lab/Plugins/PMP/RemoveNeedlesDialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Repair_polyhedron_plugin.cpp similarity index 90% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Repair_polyhedron_plugin.cpp index d585b3740843..5371fa50dfcb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Repair_polyhedron_plugin.cpp @@ -4,8 +4,8 @@ #include "Scene_polygon_soup_item.h" #include "Scene_points_with_normal_item.h" #include -#include -#include +#include +#include #include #include @@ -31,13 +31,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_repair_polyhedron_plugin : +class CGAL_Lab_repair_cgal_lab_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "repair_polyhedron_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "repair_polyhedron_plugin.json") public: @@ -181,10 +181,10 @@ public Q_SLOTS: QAction* actionAddBbox; Messages_interface* messages; -}; // end Polyhedron_demo_repair_polyhedron_plugin +}; // end CGAL_Lab_repair_cgal_lab_plugin template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveIsolatedVertices_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveIsolatedVertices_triggered(Scene_interface::Item_id index) { Item* poly_item = qobject_cast(scene->item(index)); @@ -200,7 +200,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveIsolatedVertices_t } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveIsolatedVertices_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveIsolatedVertices_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -208,7 +208,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveIsolatedVertices_t QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveNeedlesAndCaps_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveNeedlesAndCaps_triggered() { QCursor tmp_cursor(Qt::WaitCursor); CGAL::Three::Three::CursorScopeGuard guard(tmp_cursor); @@ -235,7 +235,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveNeedlesAndCaps_tri sm_item->itemChanged(); } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionSnapBorders_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionSnapBorders_triggered() { const Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); @@ -375,7 +375,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionSnapBorders_triggered() } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionAddBbox_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionAddBbox_triggered(Scene_interface::Item_id index) { Item* poly_item = qobject_cast(scene->item(index)); @@ -403,14 +403,14 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionAddBbox_triggered(Scene_ } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionAddBbox_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionAddBbox_triggered() { const Scene_interface::Item_id index = scene->mainSelectionIndex(); on_actionAddBbox_triggered(index); } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveDegenerateFaces_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveDegenerateFaces_triggered(Scene_interface::Item_id index) { Item* poly_item = qobject_cast(scene->item(index)); if (poly_item) @@ -430,7 +430,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveDegenerateFaces_tr } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveDegenerateFaces_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveDegenerateFaces_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -439,7 +439,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveDegenerateFaces_tr } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveSelfIntersections_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveSelfIntersections_triggered(Scene_interface::Item_id index) { Item* poly_item = qobject_cast(scene->item(index)); if (poly_item) @@ -459,7 +459,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveSelfIntersections_ } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveSelfIntersections_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionRemoveSelfIntersections_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -468,7 +468,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionRemoveSelfIntersections_ } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefine_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionAutorefine_triggered(Scene_interface::Item_id index) { Item* poly_item = qobject_cast(scene->item(index)); if (poly_item) @@ -486,7 +486,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefine_triggered(Sce } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefine_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionAutorefine_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -495,7 +495,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefine_triggered() } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionNewAutorefine_triggered(const std::vector& indices) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionNewAutorefine_triggered(const std::vector& indices) { namespace PMP = CGAL::Polygon_mesh_processing; Polygon_soup::Points points; @@ -551,7 +551,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionNewAutorefine_triggered( Q_EMIT new_item->itemChanged(); } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionNewAutorefine_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionNewAutorefine_triggered() { std::vector indices; for (Scene_interface::Item_id index : scene->selectionIndices()) @@ -567,7 +567,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionNewAutorefine_triggered( } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefineAndRMSelfIntersections_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionAutorefineAndRMSelfIntersections_triggered(Scene_interface::Item_id index) { Item* poly_item = qobject_cast(scene->item(index)); if (poly_item) @@ -589,7 +589,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefineAndRMSelfInter } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefineAndRMSelfIntersections_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionAutorefineAndRMSelfIntersections_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -598,7 +598,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionAutorefineAndRMSelfInter } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionStitchCloseBorderHalfedges_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionStitchCloseBorderHalfedges_triggered(Scene_interface::Item_id index) { typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; namespace PMP = CGAL::Polygon_mesh_processing; @@ -623,7 +623,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionStitchCloseBorderHalfedg } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionStitchCloseBorderHalfedges_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionStitchCloseBorderHalfedges_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -632,7 +632,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionStitchCloseBorderHalfedg } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionDuplicateNMVertices_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionDuplicateNMVertices_triggered(Scene_interface::Item_id index) { namespace PMP = CGAL::Polygon_mesh_processing; @@ -649,7 +649,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionDuplicateNMVertices_trig } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionExtractNMVertices_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionExtractNMVertices_triggered(Scene_interface::Item_id index) { namespace PMP = CGAL::Polygon_mesh_processing; typedef typename boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -674,7 +674,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionExtractNMVertices_trigge } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionDuplicateNMVertices_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionDuplicateNMVertices_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -682,7 +682,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionDuplicateNMVertices_trig QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionExtractNMVertices_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionExtractNMVertices_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -691,7 +691,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionExtractNMVertices_trigge } template -void Polyhedron_demo_repair_polyhedron_plugin::on_actionMergeDuplicatedVerticesOnBoundaryCycles_triggered(Scene_interface::Item_id index) +void CGAL_Lab_repair_cgal_lab_plugin::on_actionMergeDuplicatedVerticesOnBoundaryCycles_triggered(Scene_interface::Item_id index) { namespace PMP = CGAL::Polygon_mesh_processing; @@ -709,7 +709,7 @@ void Polyhedron_demo_repair_polyhedron_plugin::on_actionMergeDuplicatedVerticesO } } -void Polyhedron_demo_repair_polyhedron_plugin::on_actionMergeDuplicatedVerticesOnBoundaryCycles_triggered() +void CGAL_Lab_repair_cgal_lab_plugin::on_actionMergeDuplicatedVerticesOnBoundaryCycles_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); const Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_soup.ui b/Lab/demo/Lab/Plugins/PMP/Repair_soup.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_soup.ui rename to Lab/demo/Lab/Plugins/PMP/Repair_soup.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection.cpp b/Lab/demo/Lab/Plugins/PMP/Scene_facegraph_item_k_ring_selection.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection.cpp rename to Lab/demo/Lab/Plugins/PMP/Scene_facegraph_item_k_ring_selection.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection.h b/Lab/demo/Lab/Plugins/PMP/Scene_facegraph_item_k_ring_selection.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection.h rename to Lab/demo/Lab/Plugins/PMP/Scene_facegraph_item_k_ring_selection.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h b/Lab/demo/Lab/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h rename to Lab/demo/Lab/Plugins/PMP/Scene_facegraph_item_k_ring_selection_config.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_mcf_item.cpp b/Lab/demo/Lab/Plugins/PMP/Scene_mcf_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_mcf_item.cpp rename to Lab/demo/Lab/Plugins/PMP/Scene_mcf_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_mcf_item.h b/Lab/demo/Lab/Plugins/PMP/Scene_mcf_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Scene_mcf_item.h rename to Lab/demo/Lab/Plugins/PMP/Scene_mcf_item.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Selection_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Selection_plugin.cpp index 2c50e614ac01..f9ce55fd6f77 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Selection_plugin.cpp @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #include #include "ui_Selection_widget.h" @@ -72,15 +72,15 @@ struct Polyline_visitor void end_polyline(){} }; using namespace CGAL::Three; -class Polyhedron_demo_selection_plugin : +class CGAL_Lab_selection_plugin : public QObject, - public Polyhedron_demo_plugin_helper, - public Polyhedron_demo_io_plugin_interface + public CGAL_Lab_plugin_helper, + public CGAL_Lab_io_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface CGAL::Three::Polyhedron_demo_io_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "selection_plugin.json") - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface CGAL::Three::CGAL_Lab_io_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "selection_plugin.json") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.IOPluginInterface/1.90") public: QString nameFilters() const override { return "Selection files(*.selection.txt)"; } QString name() const override { return "selection_sm_plugin"; } @@ -153,7 +153,7 @@ class Polyhedron_demo_selection_plugin : << actionSelfIntersection; } - using Polyhedron_demo_io_plugin_interface::init; + using CGAL_Lab_io_plugin_interface::init; virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) override{ mw = mainWindow; scene = scene_interface; @@ -202,7 +202,7 @@ class Polyhedron_demo_selection_plugin : connect(ui_widget.Selection_type_combo_box, SIGNAL(currentIndexChanged(int)), this, SLOT(on_Selection_type_combo_box_changed(int))); connect(ui_widget.lassoCheckBox, &QCheckBox::toggled, - this, &Polyhedron_demo_selection_plugin::on_LassoCheckBox_changed); + this, &CGAL_Lab_selection_plugin::on_LassoCheckBox_changed); connect(ui_widget.Insertion_radio_button, SIGNAL(toggled(bool)), this, SLOT(on_Insertion_radio_button_toggled(bool))); connect(ui_widget.Brush_size_spin_box, SIGNAL(valueChanged(int)), this, SLOT(on_Brush_size_spin_box_changed(int))); connect(ui_widget.validateButton, SIGNAL(clicked()), this, SLOT(on_validateButton_clicked())); @@ -946,7 +946,7 @@ public Q_SLOTS: //Split vertex case 1: { - QPixmap pm(":/cgal/Polyhedron_3/resources/euler_vertex.png"); + QPixmap pm(":/cgal/Lab/resources/euler_vertex.png"); ui_widget.docImage_Label->setPixmap(pm); break; } @@ -955,14 +955,14 @@ public Q_SLOTS: //Split face case 4: { - QPixmap pm(":/cgal/Polyhedron_3/resources/euler_facet.png"); + QPixmap pm(":/cgal/Lab/resources/euler_facet.png"); ui_widget.docImage_Label->setPixmap(pm); break; } //Collapse edge case 5: { - QPixmap pm(":/cgal/Polyhedron_3/resources/general_collapse.png"); + QPixmap pm(":/cgal/Lab/resources/general_collapse.png"); ui_widget.docImage_Label->setPixmap(pm); break; } @@ -971,21 +971,21 @@ public Q_SLOTS: //Remove center vertex case 8: { - QPixmap pm(":/cgal/Polyhedron_3/resources/euler_center.png"); + QPixmap pm(":/cgal/Lab/resources/euler_center.png"); ui_widget.docImage_Label->setPixmap(pm); break; } //Add vertex and face to border case 9: { - QPixmap pm(":/cgal/Polyhedron_3/resources/add_facet1.png"); + QPixmap pm(":/cgal/Lab/resources/add_facet1.png"); ui_widget.docImage_Label->setPixmap(pm); break; } //add facet to border case 10: { - QPixmap pm(":/cgal/Polyhedron_3/resources/add_facet2.png"); + QPixmap pm(":/cgal/Lab/resources/add_facet2.png"); ui_widget.docImage_Label->setPixmap(pm); break; } @@ -1173,7 +1173,7 @@ void filter_operations() Selection_item_map selection_item_map; int last_mode; bool from_plugin; -}; // end Polyhedron_demo_selection_plugin +}; // end CGAL_Lab_selection_plugin template @@ -1193,7 +1193,7 @@ bool selfIntersect(Mesh* mesh, std::vector::face_descriptor Face_descriptor; typedef boost::graph_traits::halfedge_descriptor halfedge_descriptor; @@ -1271,6 +1271,6 @@ void Polyhedron_demo_selection_plugin::on_actionSelfIntersection_triggered() QMessageBox::information(mw, tr("No self intersection"), tr("None of the selected surfaces self-intersect.")); } -//Q_EXPORT_PLUGIN2(Polyhedron_demo_selection_plugin, Polyhedron_demo_selection_plugin) +//Q_EXPORT_PLUGIN2(CGAL_Lab_selection_plugin, CGAL_Lab_selection_plugin) #include "Selection_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_widget.ui b/Lab/demo/Lab/Plugins/PMP/Selection_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_widget.ui rename to Lab/demo/Lab/Plugins/PMP/Selection_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/SelfSnapDialog.ui b/Lab/demo/Lab/Plugins/PMP/SelfSnapDialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/SelfSnapDialog.ui rename to Lab/demo/Lab/Plugins/PMP/SelfSnapDialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Smoothing_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Smoothing_plugin.cpp index 70747cdddc9f..91673050de35 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Smoothing_plugin.cpp @@ -1,7 +1,7 @@ #include -#include -#include +#include +#include #include #include @@ -42,12 +42,12 @@ typedef boost::graph_traits::face_descriptor face_descrip typedef CGAL::dynamic_vertex_property_t Vertex_bool_property; typedef typename boost::property_map::type VCMap; -class Polyhedron_demo_smothing_plugin - : public QObject, public Polyhedron_demo_plugin_helper +class CGAL_Lab_smothing_plugin + : public QObject, public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_plugin.ui b/Lab/demo/Lab/Plugins/PMP/Smoothing_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_plugin.ui rename to Lab/demo/Lab/Plugins/PMP/Smoothing_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_tangential_relaxation.ui b/Lab/demo/Lab/Plugins/PMP/Smoothing_tangential_relaxation.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Smoothing_tangential_relaxation.ui rename to Lab/demo/Lab/Plugins/PMP/Smoothing_tangential_relaxation.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Surface_intersection_plugin.cpp similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Surface_intersection_plugin.cpp index 968a270f7064..8eddd406ae4d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Surface_intersection_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Surface_intersection_plugin.cpp @@ -3,7 +3,7 @@ #include "Kernel_type.h" #include "Scene_surface_mesh_item.h" -#include +#include #include #include "Scene_polylines_item.h" @@ -26,13 +26,13 @@ typedef boost::graph_traits::face_descriptor using namespace CGAL::Three; namespace PMP = CGAL::Polygon_mesh_processing; -class Polyhedron_demo_intersection_plugin : +class CGAL_Lab_intersection_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "surface_intersection_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "surface_intersection_plugin.json") public: @@ -104,9 +104,9 @@ public Q_SLOTS: void intersectionSurfacePolyline(); void intersectionPolylines(); -}; // end class Polyhedron_demo_intersection_plugin +}; // end class CGAL_Lab_intersection_plugin -void Polyhedron_demo_intersection_plugin::intersectionSurfaces() +void CGAL_Lab_intersection_plugin::intersectionSurfaces() { Scene_face_graph_item* itemA = nullptr; for(CGAL::Three::Scene_interface::Item_id index : scene->selectionIndices()) @@ -168,7 +168,7 @@ void Polyhedron_demo_intersection_plugin::intersectionSurfaces() } } #include -void Polyhedron_demo_intersection_plugin::intersectionPolylines() +void CGAL_Lab_intersection_plugin::intersectionPolylines() { typedef std::pair< std::pair, @@ -260,7 +260,7 @@ void Polyhedron_demo_intersection_plugin::intersectionPolylines() } } -void Polyhedron_demo_intersection_plugin::intersectionSurfacePolyline() +void CGAL_Lab_intersection_plugin::intersectionSurfacePolyline() { typedef std::pair >Poly_intersection; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp b/Lab/demo/Lab/Plugins/PMP/Triangulate_facets_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp rename to Lab/demo/Lab/Plugins/PMP/Triangulate_facets_plugin.cpp index cd91bd1a6eb1..cef1f5e8aab3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp +++ b/Lab/demo/Lab/Plugins/PMP/Triangulate_facets_plugin.cpp @@ -2,7 +2,7 @@ #include #include #include "Messages_interface.h" -#include +#include #include #include "Scene_surface_mesh_item.h" @@ -12,13 +12,13 @@ #include using namespace CGAL::Three; -class Polyhedron_demo_triangulate_facets_plugin : +class CGAL_Lab_triangulate_facets_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "triangulate_facets_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "triangulate_facets_plugin.json") typedef Scene_surface_mesh_item::Face_graph FaceGraph; typedef boost::graph_traits::face_descriptor face_descriptor; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Alpha_shape_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Alpha_shape_plugin.cpp index 0c9bf82f8afb..15f2b812b36f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Alpha_shape_plugin.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -111,7 +111,7 @@ public Q_SLOTS: -#include +#include class DockWidget : public QDockWidget, public Ui::AlphaShapesWidget @@ -127,11 +127,11 @@ class DockWidget : using namespace CGAL::Three; class Q_DECL_EXPORT Alpha_shape_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public : void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*)override { diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_widget.ui b/Lab/demo/Lab/Plugins/Point_set/Alpha_shape_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Alpha_shape_widget.ui rename to Lab/demo/Lab/Plugins/Point_set/Alpha_shape_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt b/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt index 3bade0d26e6e..7434d33fa30b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) if(TARGET CGAL::Eigen3_support) find_package(SCIP QUIET) @@ -25,7 +25,7 @@ if(TARGET CGAL::Eigen3_support) endif() qt6_wrap_ui(surface_reconstructionUI_FILES Surface_reconstruction_plugin.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( surface_reconstruction_plugin Surface_reconstruction_plugin Surface_reconstruction_poisson_impl.cpp @@ -48,7 +48,7 @@ if(TARGET CGAL::Eigen3_support) qt6_wrap_ui(point_set_normal_estimationUI_FILES Point_set_normal_estimation_plugin.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( point_set_normal_estimation_plugin Point_set_normal_estimation_plugin ${point_set_normal_estimationUI_FILES} KEYWORDS PointSetProcessing Classification) @@ -58,21 +58,21 @@ if(TARGET CGAL::Eigen3_support) CGAL::Eigen3_support) qt6_wrap_ui(features_detection_pluginUI_FILES Features_detection_plugin.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( features_detection_plugin Features_detection_plugin ${features_detection_pluginUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries( features_detection_plugin PUBLIC scene_points_with_normal_item CGAL::Eigen3_support) - polyhedron_demo_plugin(point_set_smoothing_plugin Point_set_smoothing_plugin + cgal_lab_plugin(point_set_smoothing_plugin Point_set_smoothing_plugin KEYWORDS PointSetProcessing) target_link_libraries( point_set_smoothing_plugin PUBLIC scene_points_with_normal_item scene_callback_signaler CGAL::Eigen3_support) - polyhedron_demo_plugin( + cgal_lab_plugin( point_set_average_spacing_plugin Point_set_average_spacing_plugin KEYWORDS PointSetProcessing Classification) target_link_libraries( @@ -82,7 +82,7 @@ if(TARGET CGAL::Eigen3_support) qt6_wrap_ui(point_set_shape_detectionUI_FILES Point_set_shape_detection_plugin.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( point_set_shape_detection_plugin Point_set_shape_detection_plugin ${point_set_shape_detectionUI_FILES} KEYWORDS PointSetProcessing Classification) @@ -98,7 +98,7 @@ if(TARGET CGAL::Eigen3_support) if(TARGET CGAL::OpenGR_support OR CGAL::pointmatcher_support) qt6_wrap_ui(register_point_setsUI_FILES Register_point_sets_plugin.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( register_point_sets_plugin Register_point_sets_plugin ${register_point_setsUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries(register_point_sets_plugin @@ -125,7 +125,7 @@ endif() qt6_wrap_ui(point_set_bilateral_smoothingUI_FILES Point_set_bilateral_smoothing_plugin.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_bilateral_smoothing_plugin Point_set_bilateral_smoothing_plugin ${point_set_bilateral_smoothingUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries( @@ -133,7 +133,7 @@ target_link_libraries( scene_callback_signaler) qt6_wrap_ui(ps_outliers_removal_UI_FILES Point_set_outliers_removal_plugin.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_outliers_removal_plugin Point_set_outliers_removal_plugin ${ps_outliers_removal_UI_FILES} KEYWORDS PointSetProcessing) target_link_libraries( @@ -141,7 +141,7 @@ target_link_libraries( scene_callback_signaler) qt6_wrap_ui(point_set_selectionUI_FILES Point_set_selection_widget.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_selection_plugin Point_set_selection_plugin ${point_set_selectionUI_FILES} KEYWORDS PointSetProcessing Classification) target_link_libraries( @@ -149,7 +149,7 @@ target_link_libraries( scene_polylines_item scene_edit_box_item) qt6_wrap_ui(point_set_simplificationUI_FILES Point_set_simplification_plugin.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_simplification_plugin Point_set_simplification_plugin ${point_set_simplificationUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries( @@ -157,43 +157,43 @@ target_link_libraries( scene_callback_signaler) qt6_wrap_ui(point_set_upsamplingUI_FILES Point_set_upsampling_plugin.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_upsampling_plugin Point_set_upsampling_plugin ${point_set_upsamplingUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries(point_set_upsampling_plugin PUBLIC scene_points_with_normal_item) qt6_wrap_ui(point_set_wlopFILES Point_set_wlop_plugin.ui) -polyhedron_demo_plugin(point_set_wlop_plugin Point_set_wlop_plugin +cgal_lab_plugin(point_set_wlop_plugin Point_set_wlop_plugin ${point_set_wlopFILES} KEYWORDS PointSetProcessing) target_link_libraries(point_set_wlop_plugin PUBLIC scene_points_with_normal_item scene_callback_signaler) -polyhedron_demo_plugin(point_set_clustering_plugin Point_set_clustering_plugin +cgal_lab_plugin(point_set_clustering_plugin Point_set_clustering_plugin KEYWORDS PointSetProcessing) target_link_libraries( point_set_clustering_plugin PUBLIC scene_points_with_normal_item scene_callback_signaler) -polyhedron_demo_plugin(merge_point_sets_plugin Merge_point_sets_plugin KEYWORDS +cgal_lab_plugin(merge_point_sets_plugin Merge_point_sets_plugin KEYWORDS PointSetProcessing Classification) target_link_libraries(merge_point_sets_plugin PUBLIC scene_points_with_normal_item) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_interference_plugin Point_set_interference_plugin KEYWORDS PointSetProcessing) target_link_libraries(point_set_interference_plugin PUBLIC scene_points_with_normal_item) qt6_wrap_ui(alpha_shapeUI_FILES Alpha_shape_widget.ui) -polyhedron_demo_plugin(alpha_shape_plugin Alpha_shape_plugin +cgal_lab_plugin(alpha_shape_plugin Alpha_shape_plugin ${alpha_shapeUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries(alpha_shape_plugin PUBLIC scene_points_with_normal_item scene_c3t3_item) qt6_wrap_ui(distanceUI_FILES Point_set_to_mesh_distance_widget.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( point_set_to_mesh_distance_plugin Point_set_to_mesh_distance_plugin ${distanceUI_FILES} KEYWORDS PointSetProcessing) target_link_libraries( diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Features_detection_plugin.cpp similarity index 81% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Features_detection_plugin.cpp index 7cf27359a7fd..99d7ab150263 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Features_detection_plugin.cpp @@ -4,8 +4,8 @@ #include #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include @@ -13,13 +13,13 @@ #include "ui_Features_detection_plugin.h" using namespace CGAL::Three; -class Polyhedron_demo_features_detection_plugin : +class CGAL_Lab_features_detection_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionDetectFeatures; public: QList actions() const { return QList() << actionDetectFeatures; } @@ -40,13 +40,13 @@ public Q_SLOTS: void on_actionDetectFeatures_triggered(); private: Scene_interface* scene; -}; // end Polyhedron_demo_features_detection_plugin +}; // end CGAL_Lab_features_detection_plugin -class Polyhedron_demo_features_detection_dialog : public QDialog, private Ui::VCMFeaturesDetectionDialog +class CGAL_Lab_features_detection_dialog : public QDialog, private Ui::VCMFeaturesDetectionDialog { Q_OBJECT public: - Polyhedron_demo_features_detection_dialog(QWidget* /*parent*/ = nullptr) + CGAL_Lab_features_detection_dialog(QWidget* /*parent*/ = nullptr) { setupUi(this); } @@ -56,7 +56,7 @@ class Polyhedron_demo_features_detection_dialog : public QDialog, private Ui::VC float threshold() const { return m_inputFeaturesThreshold->value(); } }; -void Polyhedron_demo_features_detection_plugin::on_actionDetectFeatures_triggered() +void CGAL_Lab_features_detection_plugin::on_actionDetectFeatures_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -71,7 +71,7 @@ void Polyhedron_demo_features_detection_plugin::on_actionDetectFeatures_triggere return; // Gets options - Polyhedron_demo_features_detection_dialog dialog; + CGAL_Lab_features_detection_dialog dialog; if(!dialog.exec()) return; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Features_detection_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Features_detection_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Merge_point_sets_plugin.cpp similarity index 84% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Merge_point_sets_plugin.cpp index 694ce765c3b0..d59a237e5ed4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Merge_point_sets_plugin.cpp @@ -1,6 +1,6 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include +#include #include #include @@ -12,13 +12,13 @@ using namespace CGAL::Three; -class Polyhedron_demo_merge_point_sets_plugin : +class CGAL_Lab_merge_point_sets_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: QAction* actionMergePointSets; @@ -51,9 +51,9 @@ public Q_SLOTS: void on_actionMergePointSets_triggered(); private : Scene_interface *scene; -}; // end Polyhedron_demo_merge_point_sets_plugin +}; // end CGAL_Lab_merge_point_sets_plugin -void Polyhedron_demo_merge_point_sets_plugin::on_actionMergePointSets_triggered() +void CGAL_Lab_merge_point_sets_plugin::on_actionMergePointSets_triggered() { QApplication::setOverrideCursor(Qt::WaitCursor); CGAL::Three::Scene_interface::Item_id mainSelectionIndex diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_average_spacing_plugin.cpp similarity index 88% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_average_spacing_plugin.cpp index 78c0e2482d45..41c25a194479 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_average_spacing_plugin.cpp @@ -2,8 +2,8 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -43,13 +43,13 @@ struct Compute_average_spacing_functor }; using namespace CGAL::Three; -class Polyhedron_demo_point_set_average_spacing_plugin : +class CGAL_Lab_point_set_average_spacing_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: QAction* actionAverageSpacing; @@ -76,9 +76,9 @@ class Polyhedron_demo_point_set_average_spacing_plugin : public Q_SLOTS: void on_actionAverageSpacing_triggered(); -}; // end Polyhedron_demo_point_set_average_spacing_plugin +}; // end CGAL_Lab_point_set_average_spacing_plugin -void Polyhedron_demo_point_set_average_spacing_plugin::on_actionAverageSpacing_triggered() +void CGAL_Lab_point_set_average_spacing_plugin::on_actionAverageSpacing_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp similarity index 89% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp index 03f18810236f..d52a38e2e19f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -49,13 +49,13 @@ struct Bilateral_smoothing_functor }; using namespace CGAL::Three; -class Polyhedron_demo_point_set_bilateral_smoothing_plugin : +class CGAL_Lab_point_set_bilateral_smoothing_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionBilateralSmoothing; @@ -80,7 +80,7 @@ class Polyhedron_demo_point_set_bilateral_smoothing_plugin : public Q_SLOTS: void on_actionBilateralSmoothing_triggered(); -}; // end Polyhedron_demo_point_set_bilateral_smoothing_plugin +}; // end CGAL_Lab_point_set_bilateral_smoothing_plugin class Point_set_demo_point_set_bilateral_smoothing_dialog : public QDialog, private Ui::PointSetBilateralSmoothingDialog { @@ -96,7 +96,7 @@ class Point_set_demo_point_set_bilateral_smoothing_dialog : public QDialog, priv unsigned int sharpness_angle () const { return m_sharpnessAngle->value(); } }; -void Polyhedron_demo_point_set_bilateral_smoothing_plugin::on_actionBilateralSmoothing_triggered() +void CGAL_Lab_point_set_bilateral_smoothing_plugin::on_actionBilateralSmoothing_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_clustering_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_clustering_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_clustering_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_clustering_plugin.cpp index b998a35750e2..d078763cc97e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_clustering_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_clustering_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -48,13 +48,13 @@ struct Clustering_functor using namespace CGAL::Three; -class Polyhedron_demo_point_set_clustering_plugin : +class CGAL_Lab_point_set_clustering_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionCluster; @@ -83,7 +83,7 @@ public Q_SLOTS: }; // end -void Polyhedron_demo_point_set_clustering_plugin::on_actionCluster_triggered() +void CGAL_Lab_point_set_clustering_plugin::on_actionCluster_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_interference_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_interference_plugin.cpp similarity index 92% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_interference_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_interference_plugin.cpp index f81e808381c7..6ab2aa44ace5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_interference_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_interference_plugin.cpp @@ -2,7 +2,7 @@ #include "Scene_points_with_normal_item.h" //CGAL includes #include -#include +#include #include #include #include @@ -21,12 +21,12 @@ typedef CGAL::Parallel_if_available_tag Concurrency_tag; class Point_set_interference_plugin: public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: bool applicable(QAction *) const diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp index 2f05e7383088..f27dec9b4880 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -90,13 +90,13 @@ struct Vector_to_pmap using namespace CGAL::Three; -class Polyhedron_demo_point_set_normal_estimation_plugin : +class CGAL_Lab_point_set_normal_estimation_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionNormalEstimation; QAction* actionNormalOrientation; @@ -171,7 +171,7 @@ class Point_set_demo_normal_estimation_dialog : public QDialog, private Ui::Norm }; -void Polyhedron_demo_point_set_normal_estimation_plugin::on_actionNormalInversion_triggered() +void CGAL_Lab_point_set_normal_estimation_plugin::on_actionNormalInversion_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -193,7 +193,7 @@ void Polyhedron_demo_point_set_normal_estimation_plugin::on_actionNormalInversio } } -void Polyhedron_demo_point_set_normal_estimation_plugin::on_actionNormalEstimation_triggered() +void CGAL_Lab_point_set_normal_estimation_plugin::on_actionNormalEstimation_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -292,7 +292,7 @@ void Polyhedron_demo_point_set_normal_estimation_plugin::on_actionNormalEstimati } } -void Polyhedron_demo_point_set_normal_estimation_plugin::on_actionNormalOrientation_triggered() +void CGAL_Lab_point_set_normal_estimation_plugin::on_actionNormalOrientation_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_normal_estimation_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_normal_estimation_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp similarity index 89% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp index c18343a17a95..d1262d2448a0 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -51,13 +51,13 @@ struct Outlier_removal_functor }; using namespace CGAL::Three; -class Polyhedron_demo_point_set_outliers_removal_plugin : +class CGAL_Lab_point_set_outliers_removal_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: QAction* actionOutlierRemoval; @@ -84,7 +84,7 @@ class Polyhedron_demo_point_set_outliers_removal_plugin : public Q_SLOTS: void on_actionOutlierRemoval_triggered(); -}; // end Polyhedron_demo_point_set_outliers_removal_plugin +}; // end CGAL_Lab_point_set_outliers_removal_plugin class Point_set_demo_outlier_removal_dialog : public QDialog, private Ui::OutlierRemovalDialog { @@ -101,7 +101,7 @@ class Point_set_demo_outlier_removal_dialog : public QDialog, private Ui::Outlie int nbNeighbors() const { return m_inputNbNeighbors->value(); } }; -void Polyhedron_demo_point_set_outliers_removal_plugin::on_actionOutlierRemoval_triggered() +void CGAL_Lab_point_set_outliers_removal_plugin::on_actionOutlierRemoval_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_outliers_removal_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_outliers_removal_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_selection_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_selection_plugin.cpp index 9281c202af22..d0021dee7013 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_selection_plugin.cpp @@ -16,7 +16,7 @@ #include "Scene_polylines_item.h" #include -#include +#include #include #include "ui_Point_set_selection_widget.h" #include @@ -540,13 +540,13 @@ class Neighborhood }; -class Polyhedron_demo_point_set_selection_plugin : +class CGAL_Lab_point_set_selection_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: bool applicable(QAction*) const { return qobject_cast(scene->item(scene->mainSelectionIndex())); @@ -950,7 +950,7 @@ public Q_SLOTS: edit_box->setRenderingMode(Wireframe); edit_box->setName("Selection Box"); connect(edit_box, &Scene_edit_box_item::aboutToBeDestroyed, - this, &Polyhedron_demo_point_set_selection_plugin::reset_editbox); + this, &CGAL_Lab_point_set_selection_plugin::reset_editbox); scene->addItem(edit_box); for(CGAL::QGLViewer* v : CGAL::QGLViewer::QGLViewerPool()){ v->installEventFilter(edit_box); @@ -994,8 +994,8 @@ public Q_SLOTS: double rg_epsilon; double rg_cluster_epsilon; unsigned int rg_normal_threshold; -}; // end Polyhedron_demo_point_set_selection_plugin +}; // end CGAL_Lab_point_set_selection_plugin -//Q_EXPORT_PLUGIN2(Polyhedron_demo_point_set_selection_plugin, Polyhedron_demo_point_set_selection_plugin) +//Q_EXPORT_PLUGIN2(CGAL_Lab_point_set_selection_plugin, CGAL_Lab_point_set_selection_plugin) #include "Point_set_selection_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_widget.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_selection_widget.ui similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_widget.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_selection_widget.ui index ad54bab94ea5..a7434b528b01 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_widget.ui +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_selection_widget.ui @@ -47,7 +47,7 @@ - + :/cgal/icons/resources/pss_rectangle.png:/cgal/icons/resources/pss_rectangle.png @@ -76,7 +76,7 @@ - + :/cgal/icons/resources/pss_freeform.png:/cgal/icons/resources/pss_freeform.png @@ -99,7 +99,7 @@ - + :/cgal/icons/resources/pss_region.png:/cgal/icons/resources/pss_region.png @@ -125,7 +125,7 @@ - + :/cgal/icons/resources/pss_box.png:/cgal/icons/resources/pss_box.png @@ -169,7 +169,7 @@ - + :/cgal/icons/resources/pss_new.png:/cgal/icons/resources/pss_new.png @@ -198,7 +198,7 @@ - + :/cgal/icons/resources/pss_union.png:/cgal/icons/resources/pss_union.png @@ -224,7 +224,7 @@ - + :/cgal/icons/resources/pss_inter.png:/cgal/icons/resources/pss_inter.png @@ -250,7 +250,7 @@ - + :/cgal/icons/resources/pss_diff.png:/cgal/icons/resources/pss_diff.png @@ -283,7 +283,7 @@ - + :/cgal/icons/resources/help_button.png:/cgal/icons/resources/help_button.png @@ -329,10 +329,10 @@ - - - - + + + + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_shape_detection_plugin.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_shape_detection_plugin.cpp index 5648125b774a..1baaa63af33a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_shape_detection_plugin.cpp @@ -4,8 +4,8 @@ #include "Scene_surface_mesh_item.h" #include -#include -#include +#include +#include #include #include @@ -111,13 +111,13 @@ class Point_set_demo_point_set_shape_detection_dialog : public QDialog, public U typedef CGAL::Exact_predicates_inexact_constructions_kernel Epic_kernel; typedef Epic_kernel::Point_3 Point; using namespace CGAL::Three; -class Polyhedron_demo_point_set_shape_detection_plugin : +class CGAL_Lab_point_set_shape_detection_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionDetect; QAction* actionEstimateParameters; @@ -904,9 +904,9 @@ class Polyhedron_demo_point_set_shape_detection_plugin : void build_alpha_shape (Point_set& points, std::shared_ptr plane, Scene_surface_mesh_item* sm_item, double epsilon); -}; // end Polyhedron_demo_point_set_shape_detection_plugin +}; // end CGAL_Lab_point_set_shape_detection_plugin -void Polyhedron_demo_point_set_shape_detection_plugin::on_actionDetectShapesSM_triggered() { +void CGAL_Lab_point_set_shape_detection_plugin::on_actionDetectShapesSM_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -952,7 +952,7 @@ void Polyhedron_demo_point_set_shape_detection_plugin::on_actionDetectShapesSM_t } } -void Polyhedron_demo_point_set_shape_detection_plugin::on_actionDetect_triggered() { +void CGAL_Lab_point_set_shape_detection_plugin::on_actionDetect_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -996,7 +996,7 @@ void Polyhedron_demo_point_set_shape_detection_plugin::on_actionDetect_triggered } template -void Polyhedron_demo_point_set_shape_detection_plugin::build_alpha_shape +void CGAL_Lab_point_set_shape_detection_plugin::build_alpha_shape (Point_set& points, std::shared_ptr plane, Scene_surface_mesh_item* sm_item, double epsilon) { typedef Kernel::Point_2 Point_2; @@ -1058,7 +1058,7 @@ void Polyhedron_demo_point_set_shape_detection_plugin::build_alpha_shape delete soup_item; } -void Polyhedron_demo_point_set_shape_detection_plugin::on_actionEstimateParameters_triggered() { +void CGAL_Lab_point_set_shape_detection_plugin::on_actionEstimateParameters_triggered() { CGAL::Random rand(static_cast(time(nullptr))); const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_shape_detection_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_shape_detection_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_simplification_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_simplification_plugin.cpp index 05eb2d414937..b2c04168025b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_simplification_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -91,13 +91,13 @@ struct Hierarchy_simplify_functor }; using namespace CGAL::Three; -class Polyhedron_demo_point_set_simplification_plugin : +class CGAL_Lab_point_set_simplification_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionSimplify; @@ -124,7 +124,7 @@ public Q_SLOTS: void on_actionSimplify_triggered(); -}; // end Polyhedron_demo_point_set_simplification_plugin +}; // end CGAL_Lab_point_set_simplification_plugin class Point_set_demo_point_set_simplification_dialog : public QDialog, private Ui::PointSetSimplificationDialog { @@ -180,7 +180,7 @@ public Q_SLOTS: }; -void Polyhedron_demo_point_set_simplification_plugin::on_actionSimplify_triggered() +void CGAL_Lab_point_set_simplification_plugin::on_actionSimplify_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_simplification_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_simplification_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_smoothing_plugin.cpp similarity index 85% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_smoothing_plugin.cpp index 84f4b902a8ba..cfab206f8f1d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_smoothing_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -36,13 +36,13 @@ struct Jet_smoothing_functor }; using namespace CGAL::Three; -class Polyhedron_demo_point_set_smoothing_plugin : +class CGAL_Lab_point_set_smoothing_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionJetSmoothing; @@ -67,9 +67,9 @@ class Polyhedron_demo_point_set_smoothing_plugin : public Q_SLOTS: void on_actionJetSmoothing_triggered(); -}; // end Polyhedron_demo_point_set_smoothing_plugin +}; // end CGAL_Lab_point_set_smoothing_plugin -void Polyhedron_demo_point_set_smoothing_plugin::on_actionJetSmoothing_triggered() +void CGAL_Lab_point_set_smoothing_plugin::on_actionJetSmoothing_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_to_mesh_distance_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_to_mesh_distance_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_to_mesh_distance_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_to_mesh_distance_plugin.cpp index ca915ab64cb8..7cd98d08b0f2 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_to_mesh_distance_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_to_mesh_distance_plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include #include @@ -120,11 +120,11 @@ class DistanceWidget: class Point_set_to_mesh_distance_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: bool applicable(QAction*) const diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_to_mesh_distance_widget.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_to_mesh_distance_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_to_mesh_distance_widget.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_to_mesh_distance_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_upsampling_plugin.cpp similarity index 90% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_upsampling_plugin.cpp index e50440ace3be..5b670819aacb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_upsampling_plugin.cpp @@ -1,8 +1,8 @@ #include "config.h" #include "Scene_points_with_normal_item.h" #include "Messages_interface.h" -#include -#include +#include +#include #include #include @@ -22,13 +22,13 @@ typedef CGAL::Parallel_if_available_tag Concurrency_tag; using namespace CGAL::Three; -class Polyhedron_demo_point_set_upsampling_plugin : +class CGAL_Lab_point_set_upsampling_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionEdgeAwareUpsampling; Messages_interface* message_interface; @@ -53,7 +53,7 @@ class Polyhedron_demo_point_set_upsampling_plugin : public Q_SLOTS: void on_actionEdgeAwareUpsampling_triggered(); -}; // end Polyhedron_demo_point_set_upsampling_plugin +}; // end CGAL_Lab_point_set_upsampling_plugin class Point_set_demo_point_set_upsampling_dialog : public QDialog, private Ui::PointSetUpsamplingDialog { @@ -76,7 +76,7 @@ class Point_set_demo_point_set_upsampling_dialog : public QDialog, private Ui::P }; -void Polyhedron_demo_point_set_upsampling_plugin::on_actionEdgeAwareUpsampling_triggered() +void CGAL_Lab_point_set_upsampling_plugin::on_actionEdgeAwareUpsampling_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_upsampling_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_upsampling_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Point_set_wlop_plugin.cpp similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Point_set_wlop_plugin.cpp index 519b4fff4efc..adbe8b3461c9 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Point_set_wlop_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #include #include @@ -70,13 +70,13 @@ struct Wlop_functor using namespace CGAL::Three; -class Polyhedron_demo_point_set_wlop_plugin : +class CGAL_Lab_point_set_wlop_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") QAction* actionSimplifyAndRegularize; @@ -101,7 +101,7 @@ class Polyhedron_demo_point_set_wlop_plugin : public Q_SLOTS: void on_actionSimplifyAndRegularize_triggered(); -}; // end Polyhedron_demo_point_set_wlop_plugin +}; // end CGAL_Lab_point_set_wlop_plugin class Point_set_demo_point_set_wlop_simplification_and_regularization_dialog : public QDialog, private Ui::WLOPRegularizationAndSimplificationDialog { @@ -116,7 +116,7 @@ class Point_set_demo_point_set_wlop_simplification_and_regularization_dialog : p double neighborhoodRadius() const { return m_neighborhoodRadius->value(); } }; -void Polyhedron_demo_point_set_wlop_plugin::on_actionSimplifyAndRegularize_triggered() +void CGAL_Lab_point_set_wlop_plugin::on_actionSimplifyAndRegularize_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Point_set_wlop_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Point_set_wlop_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Register_point_sets_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Register_point_sets_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Register_point_sets_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Register_point_sets_plugin.cpp index 70f44f0c3dc6..8ad7acc6fdc5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Register_point_sets_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Register_point_sets_plugin.cpp @@ -1,7 +1,7 @@ #include "config.h" #include "Scene_points_with_normal_item.h" -#include -#include +#include +#include #ifdef CGAL_LINKED_WITH_OPENGR #define CGAL_OPENGR_VERBOSE @@ -93,13 +93,13 @@ class Point_set_demo_register_dialog : public QDialog, private Ui::RegisterPoint -class Polyhedron_demo_register_point_sets_plugin : +class CGAL_Lab_register_point_sets_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: QAction* actionRegisterPointSets; @@ -140,9 +140,9 @@ public Q_SLOTS: void on_actionRegisterPointSets_triggered(); private : Scene_interface *scene; -}; // end Polyhedron_demo_register_point_sets_plugin +}; // end CGAL_Lab_register_point_sets_plugin -void Polyhedron_demo_register_point_sets_plugin::on_actionRegisterPointSets_triggered() +void CGAL_Lab_register_point_sets_plugin::on_actionRegisterPointSets_triggered() { std::vector items = get_point_set_items(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Register_point_sets_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Register_point_sets_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Register_point_sets_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Register_point_sets_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_advancing_front_impl.cpp b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_advancing_front_impl.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_advancing_front_impl.cpp rename to Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_advancing_front_impl.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_plugin.cpp similarity index 89% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp rename to Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_plugin.cpp index 675c6e83fab1..7edc769bf70e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_plugin.cpp @@ -11,8 +11,8 @@ #include "Scene_surface_mesh_item.h" #include "Scene_points_with_normal_item.h" #include "SMesh_type.h" -#include -#include +#include +#include #include @@ -55,11 +55,11 @@ SMesh* polygonal_reconstruct (const Point_set& points, double model_complexity, const QString& solver_name); -class Polyhedron_demo_surface_reconstruction_plugin_dialog : public QDialog, private Ui::SurfaceReconstructionDialog +class CGAL_Lab_surface_reconstruction_plugin_dialog : public QDialog, private Ui::SurfaceReconstructionDialog { Q_OBJECT public: - Polyhedron_demo_surface_reconstruction_plugin_dialog(QWidget* /*parent*/ = nullptr) + CGAL_Lab_surface_reconstruction_plugin_dialog(QWidget* /*parent*/ = nullptr) { setupUi(this); #if !defined(CGAL_USE_GLPK) && !defined(CGAL_USE_SCIP) @@ -140,14 +140,14 @@ class Polyhedron_demo_surface_reconstruction_plugin_dialog : public QDialog, pri }; -class Polyhedron_demo_surface_reconstruction_plugin : +class CGAL_Lab_surface_reconstruction_plugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_helper + public CGAL::Three::CGAL_Lab_plugin_helper { Q_OBJECT - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) QAction* actionSurfaceReconstruction; public: @@ -160,10 +160,10 @@ class Polyhedron_demo_surface_reconstruction_plugin : } - void advancing_front_reconstruction (const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog); - void scale_space_reconstruction (const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog); - void poisson_reconstruction (const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog); - void polygonal_reconstruction (const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog); + void advancing_front_reconstruction (const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog); + void scale_space_reconstruction (const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog); + void poisson_reconstruction (const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog); + void polygonal_reconstruction (const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog); //! Applicate for Point_sets with normals. bool applicable(QAction*) const { @@ -181,7 +181,7 @@ public Q_SLOTS: }; // end class Polyhedron_surface_reconstruction_plugin -void Polyhedron_demo_surface_reconstruction_plugin::on_actionSurfaceReconstruction_triggered() +void CGAL_Lab_surface_reconstruction_plugin::on_actionSurfaceReconstruction_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -191,7 +191,7 @@ void Polyhedron_demo_surface_reconstruction_plugin::on_actionSurfaceReconstructi if(pts_item) { //generate the dialog box to set the options - Polyhedron_demo_surface_reconstruction_plugin_dialog dialog; + CGAL_Lab_surface_reconstruction_plugin_dialog dialog; dialog.setWindowFlags(Qt::Dialog|Qt::CustomizeWindowHint|Qt::WindowCloseButtonHint); if (!pts_item->point_set()->has_normal_map()) @@ -234,8 +234,8 @@ void Polyhedron_demo_surface_reconstruction_plugin::on_actionSurfaceReconstructi } } -void Polyhedron_demo_surface_reconstruction_plugin::advancing_front_reconstruction -(const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog) +void CGAL_Lab_surface_reconstruction_plugin::advancing_front_reconstruction +(const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog) { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -278,8 +278,8 @@ void Polyhedron_demo_surface_reconstruction_plugin::advancing_front_reconstructi } -void Polyhedron_demo_surface_reconstruction_plugin::scale_space_reconstruction -(const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog) +void CGAL_Lab_surface_reconstruction_plugin::scale_space_reconstruction +(const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog) { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -353,8 +353,8 @@ void Polyhedron_demo_surface_reconstruction_plugin::scale_space_reconstruction } -void Polyhedron_demo_surface_reconstruction_plugin::poisson_reconstruction -(const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog) +void CGAL_Lab_surface_reconstruction_plugin::poisson_reconstruction +(const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog) { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -399,8 +399,8 @@ void Polyhedron_demo_surface_reconstruction_plugin::poisson_reconstruction } } -void Polyhedron_demo_surface_reconstruction_plugin::polygonal_reconstruction -(const Polyhedron_demo_surface_reconstruction_plugin_dialog& dialog) +void CGAL_Lab_surface_reconstruction_plugin::polygonal_reconstruction +(const CGAL_Lab_surface_reconstruction_plugin_dialog& dialog) { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.ui b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.ui rename to Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_poisson_impl.cpp b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_poisson_impl.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_poisson_impl.cpp rename to Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_poisson_impl.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_polygonal_impl.cpp b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_polygonal_impl.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_polygonal_impl.cpp rename to Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_polygonal_impl.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_scale_space_impl.cpp b/Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_scale_space_impl.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_scale_space_impl.cpp rename to Lab/demo/Lab/Plugins/Point_set/Surface_reconstruction_scale_space_impl.cpp diff --git a/Lab/demo/Lab/Plugins/Subdivision_methods/CMakeLists.txt b/Lab/demo/Lab/Plugins/Subdivision_methods/CMakeLists.txt new file mode 100644 index 000000000000..d157fa270f89 --- /dev/null +++ b/Lab/demo/Lab/Plugins/Subdivision_methods/CMakeLists.txt @@ -0,0 +1,4 @@ +include(cgallab_macros) + +cgal_lab_plugin(subdivision_methods_plugin Subdivision_methods_plugin) +target_link_libraries(subdivision_methods_plugin PUBLIC scene_surface_mesh_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp b/Lab/demo/Lab/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp similarity index 86% rename from Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp rename to Lab/demo/Lab/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp index 9b1ff6006722..8ec139d05589 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include #include "Messages_interface.h" @@ -16,15 +16,15 @@ using namespace CGAL::Three; namespace params = CGAL::parameters; -class Polyhedron_demo_subdivision_methods_plugin : +class CGAL_Lab_subdivision_methods_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: - // used by Polyhedron_demo_plugin_helper + // used by CGAL_Lab_plugin_helper QList actions() const { return _actions; } @@ -74,11 +74,11 @@ private : void apply_sqrt3(FaceGraphItem* item, int nb_steps); template void apply_doosabin(FaceGraphItem* item, int nb_steps); -}; // end Polyhedron_demo_subdivision_methods_plugin +}; // end CGAL_Lab_subdivision_methods_plugin template -void Polyhedron_demo_subdivision_methods_plugin::apply_loop(FaceGraphItem* item, int nb_steps) +void CGAL_Lab_subdivision_methods_plugin::apply_loop(FaceGraphItem* item, int nb_steps) { typename FaceGraphItem::Face_graph* graph = item->face_graph(); QElapsedTimer time; @@ -92,7 +92,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_loop(FaceGraphItem* item, scene->itemChanged(item); } -void Polyhedron_demo_subdivision_methods_plugin::on_actionLoop_triggered() +void CGAL_Lab_subdivision_methods_plugin::on_actionLoop_triggered() { CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); @@ -112,7 +112,7 @@ void Polyhedron_demo_subdivision_methods_plugin::on_actionLoop_triggered() } template -void Polyhedron_demo_subdivision_methods_plugin::apply_catmullclark(FaceGraphItem* item, int nb_steps) +void CGAL_Lab_subdivision_methods_plugin::apply_catmullclark(FaceGraphItem* item, int nb_steps) { typename FaceGraphItem::Face_graph* graph = item->face_graph(); if(!graph) return; @@ -127,7 +127,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_catmullclark(FaceGraphIte scene->itemChanged(item); } -void Polyhedron_demo_subdivision_methods_plugin::on_actionCatmullClark_triggered() +void CGAL_Lab_subdivision_methods_plugin::on_actionCatmullClark_triggered() { CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); @@ -147,7 +147,7 @@ void Polyhedron_demo_subdivision_methods_plugin::on_actionCatmullClark_triggered } template -void Polyhedron_demo_subdivision_methods_plugin::apply_sqrt3(FaceGraphItem* item, int nb_steps) +void CGAL_Lab_subdivision_methods_plugin::apply_sqrt3(FaceGraphItem* item, int nb_steps) { typename FaceGraphItem::Face_graph* graph = item->face_graph(); if(!graph) return; @@ -162,7 +162,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_sqrt3(FaceGraphItem* item scene->itemChanged(item); } -void Polyhedron_demo_subdivision_methods_plugin::on_actionSqrt3_triggered() +void CGAL_Lab_subdivision_methods_plugin::on_actionSqrt3_triggered() { CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); @@ -183,7 +183,7 @@ void Polyhedron_demo_subdivision_methods_plugin::on_actionSqrt3_triggered() } template -void Polyhedron_demo_subdivision_methods_plugin::apply_doosabin(FaceGraphItem* item, int nb_steps) +void CGAL_Lab_subdivision_methods_plugin::apply_doosabin(FaceGraphItem* item, int nb_steps) { typename FaceGraphItem::Face_graph* graph = item->face_graph(); if(!graph) return; @@ -198,7 +198,7 @@ void Polyhedron_demo_subdivision_methods_plugin::apply_doosabin(FaceGraphItem* i scene->itemChanged(item); } -void Polyhedron_demo_subdivision_methods_plugin::on_actionDooSabin_triggered() +void CGAL_Lab_subdivision_methods_plugin::on_actionDooSabin_triggered() { CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt b/Lab/demo/Lab/Plugins/Surface_mesh/CMakeLists.txt similarity index 84% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Surface_mesh/CMakeLists.txt index ff5ea5c442ff..c1d42328697d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Surface_mesh/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) @@ -8,7 +8,7 @@ if(NOT CGAL_DISABLE_GMP) find_package(CGAL REQUIRED COMPONENTS Core) qt6_wrap_ui(parameterizationUI_FILES Parameterization_widget.ui OTE_dialog.ui) - polyhedron_demo_plugin(parameterization_plugin Parameterization_plugin + cgal_lab_plugin(parameterization_plugin Parameterization_plugin ${parameterizationUI_FILES}) target_link_libraries( parameterization_plugin PUBLIC scene_surface_mesh_item scene_textured_item @@ -25,7 +25,7 @@ if(NOT CGAL_DISABLE_GMP) endif() qt6_wrap_ui(segmentationUI_FILES Mesh_segmentation_widget.ui) - polyhedron_demo_plugin(mesh_segmentation_plugin Mesh_segmentation_plugin + cgal_lab_plugin(mesh_segmentation_plugin Mesh_segmentation_plugin ${segmentationUI_FILES}) target_link_libraries(mesh_segmentation_plugin PUBLIC scene_surface_mesh_item) @@ -36,18 +36,18 @@ if(NOT CGAL_DISABLE_GMP) endif() qt6_wrap_ui( mesh_simplificationUI_FILES Mesh_simplification_dialog.ui) - polyhedron_demo_plugin(mesh_simplification_plugin Mesh_simplification_plugin ${mesh_simplificationUI_FILES}) + cgal_lab_plugin(mesh_simplification_plugin Mesh_simplification_plugin ${mesh_simplificationUI_FILES}) target_link_libraries(mesh_simplification_plugin PUBLIC scene_surface_mesh_item scene_selection_item) qt6_wrap_ui(shortestPathUI_FILES Shortest_path_widget.ui) - polyhedron_demo_plugin(shortest_path_plugin Shortest_path_plugin + cgal_lab_plugin(shortest_path_plugin Shortest_path_plugin ${shortestPathUI_FILES}) target_link_libraries( shortest_path_plugin PUBLIC scene_surface_mesh_item scene_shortest_path_item scene_basic_objects) qt6_wrap_ui(basicUI_FILES Surface_mesh_approximation_dockwidget.ui) - polyhedron_demo_plugin( + cgal_lab_plugin( surface_mesh_approximation_plugin Surface_mesh_approximation_plugin ${basicUI_FILES} VSA_wrapper.cpp) target_link_libraries( diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp index f4c70653e01d..82603e4aca6d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "ui_Mesh_segmentation_widget.h" #include "Scene_surface_mesh_item.h" @@ -53,13 +53,13 @@ struct FaceGraph_with_id_to_vector_property_map }; using namespace CGAL::Three; -class Polyhedron_demo_mesh_segmentation_plugin : +class CGAL_Lab_mesh_segmentation_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: typedef std::map > SM_item_sdf_map; @@ -139,7 +139,7 @@ class Polyhedron_demo_mesh_segmentation_plugin : } }; -void Polyhedron_demo_mesh_segmentation_plugin::init_color_map_sdf() +void CGAL_Lab_mesh_segmentation_plugin::init_color_map_sdf() { color_map_sdf = std::vector(256); int r = 0, g = 0, b = 255; @@ -153,7 +153,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::init_color_map_sdf() } } -void Polyhedron_demo_mesh_segmentation_plugin::init_color_map_segmentation() +void CGAL_Lab_mesh_segmentation_plugin::init_color_map_segmentation() { color_map_segmentation.push_back(QColor( 173, 35, 35)); @@ -173,18 +173,18 @@ void Polyhedron_demo_mesh_segmentation_plugin::init_color_map_segmentation() } -void Polyhedron_demo_mesh_segmentation_plugin::itemAboutToBeDestroyed(CGAL::Three::Scene_item* scene_item) +void CGAL_Lab_mesh_segmentation_plugin::itemAboutToBeDestroyed(CGAL::Three::Scene_item* scene_item) { if(Scene_surface_mesh_item* sm_item = qobject_cast(scene_item)) { sm_item_sdf_map.erase(sm_item); } } -void Polyhedron_demo_mesh_segmentation_plugin::on_actionSegmentation_triggered() +void CGAL_Lab_mesh_segmentation_plugin::on_actionSegmentation_triggered() { dock_widget->show(); dock_widget->raise();} template -void Polyhedron_demo_mesh_segmentation_plugin::apply_SDF_button_clicked(FacegraphItem* item) +void CGAL_Lab_mesh_segmentation_plugin::apply_SDF_button_clicked(FacegraphItem* item) { typedef typename FacegraphItem::Face_graph Facegraph; QApplication::setOverrideCursor(Qt::WaitCursor); @@ -235,7 +235,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_SDF_button_clicked(Facegrap } QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mesh_segmentation_plugin::on_SDF_button_clicked() +void CGAL_Lab_mesh_segmentation_plugin::on_SDF_button_clicked() { CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); @@ -244,7 +244,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::on_SDF_button_clicked() } template -void Polyhedron_demo_mesh_segmentation_plugin::apply_Partition_button_clicked(FacegraphItem* item) +void CGAL_Lab_mesh_segmentation_plugin::apply_Partition_button_clicked(FacegraphItem* item) { typedef typename FacegraphItem::Face_graph Facegraph; @@ -343,7 +343,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::apply_Partition_button_clicked(Fa QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_mesh_segmentation_plugin::on_Partition_button_clicked() +void CGAL_Lab_mesh_segmentation_plugin::on_Partition_button_clicked() { CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_surface_mesh_item* sm_item = qobject_cast(scene->item(index)); @@ -352,7 +352,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::on_Partition_button_clicked() } template -void Polyhedron_demo_mesh_segmentation_plugin::colorize_sdf( +void CGAL_Lab_mesh_segmentation_plugin::colorize_sdf( SceneFacegraphItem* item, SDFPropertyMap sdf_values, std::vector& color_vector) @@ -384,7 +384,7 @@ void Polyhedron_demo_mesh_segmentation_plugin::colorize_sdf( template -void Polyhedron_demo_mesh_segmentation_plugin::colorize_segmentation( +void CGAL_Lab_mesh_segmentation_plugin::colorize_segmentation( SceneFacegraphItem* item, SegmentPropertyMap segment_ids, std::vector& color_vector) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_widget.ui b/Lab/demo/Lab/Plugins/Surface_mesh/Mesh_segmentation_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_widget.ui rename to Lab/demo/Lab/Plugins/Surface_mesh/Mesh_segmentation_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_dialog.ui b/Lab/demo/Lab/Plugins/Surface_mesh/Mesh_simplification_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_dialog.ui rename to Lab/demo/Lab/Plugins/Surface_mesh/Mesh_simplification_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp similarity index 94% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp index 31f46ffc2fb3..c01293a01c67 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Scene_surface_mesh_item.h" #include "Scene_polyhedron_selection_item.h" @@ -55,13 +55,13 @@ class Custom_stop_predicate using namespace CGAL::Three; -class Polyhedron_demo_mesh_simplification_plugin : +class CGAL_Lab_mesh_simplification_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: @@ -93,9 +93,9 @@ private : QMainWindow *mw; QList _actions; -}; // end Polyhedron_demo_mesh_simplification_plugin +}; // end CGAL_Lab_mesh_simplification_plugin -void Polyhedron_demo_mesh_simplification_plugin::on_actionSimplify_triggered() +void CGAL_Lab_mesh_simplification_plugin::on_actionSimplify_triggered() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/OTE_dialog.ui b/Lab/demo/Lab/Plugins/Surface_mesh/OTE_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/OTE_dialog.ui rename to Lab/demo/Lab/Plugins/Surface_mesh/OTE_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Offset_meshing_plugin.cpp similarity index 97% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Offset_meshing_plugin.cpp index eb9be7db96ed..11e779948e8f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Offset_meshing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Offset_meshing_plugin.cpp @@ -1,6 +1,6 @@ #include "config.h" -#ifdef CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER -#include +#ifdef CGAL_LAB_DEMO_USE_SURFACE_MESHER +#include #include "ui_Remeshing_dialog.h" #include @@ -403,13 +403,13 @@ struct Mesher_thread:public QThread{ }; using namespace CGAL::Three; -class Polyhedron_demo_offset_meshing_plugin : +class CGAL_Lab_offset_meshing_plugin : public QObject, - protected Polyhedron_demo_plugin_interface + protected CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { @@ -459,9 +459,9 @@ public Q_SLOTS: QAction* actionInflateMesh; Scene_interface *scene; QMainWindow *mw; -}; // end class Polyhedron_demo_offset_meshing_plugin +}; // end class CGAL_Lab_offset_meshing_plugin -void Polyhedron_demo_offset_meshing_plugin::inflate_mesh() +void CGAL_Lab_offset_meshing_plugin::inflate_mesh() { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); Scene_item* item = scene->item(index); @@ -504,7 +504,7 @@ void Polyhedron_demo_offset_meshing_plugin::inflate_mesh() sm_item->invalidateOpenGLBuffers(); } -void Polyhedron_demo_offset_meshing_plugin::offset_meshing() +void CGAL_Lab_offset_meshing_plugin::offset_meshing() { Scene_surface_mesh_item* sm_item = nullptr; Scene_polygon_soup_item* soup_item = nullptr; @@ -688,4 +688,4 @@ void Polyhedron_demo_offset_meshing_plugin::offset_meshing() #include "Offset_meshing_plugin.moc" -#endif // CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER +#endif // CGAL_LAB_DEMO_USE_SURFACE_MESHER diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Parameterization_plugin.cpp similarity index 96% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Parameterization_plugin.cpp index fc3ab82204f5..d9ec9149133a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Parameterization_plugin.cpp @@ -7,8 +7,8 @@ #include "Scene_textured_surface_mesh_item.h" #include "Scene_polyhedron_selection_item.h" #include "SMesh_type.h" -#include -#include +#include +#include #include #include "Scene.h" #include @@ -308,22 +308,22 @@ public : using namespace CGAL::Three; -class Polyhedron_demo_parameterization_plugin : +class CGAL_Lab_parameterization_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: - // used by Polyhedron_demo_plugin_helper + // used by CGAL_Lab_plugin_helper QList actions() const { return _actions; } - ~Polyhedron_demo_parameterization_plugin() + ~CGAL_Lab_parameterization_plugin() { delete navigation; } @@ -381,8 +381,8 @@ class Polyhedron_demo_parameterization_plugin : ui_widget.graphicsView->installEventFilter(navigation); ui_widget.graphicsView->viewport()->installEventFilter(navigation); ui_widget.component_numberLabel->setText("Component : 1"); - connect(ui_widget.prevButton, &QPushButton::clicked, this, &Polyhedron_demo_parameterization_plugin::on_prevButton_pressed); - connect(ui_widget.nextButton, &QPushButton::clicked, this, &Polyhedron_demo_parameterization_plugin::on_nextButton_pressed); + connect(ui_widget.prevButton, &QPushButton::clicked, this, &CGAL_Lab_parameterization_plugin::on_prevButton_pressed); + connect(ui_widget.nextButton, &QPushButton::clicked, this, &CGAL_Lab_parameterization_plugin::on_nextButton_pressed); addDockWidget(dock_widget); dock_widget->setVisible(false); current_uv_item = nullptr; @@ -501,9 +501,9 @@ public Q_SLOTS: Navigation* navigation = nullptr; QMap projections; UVItem* current_uv_item = nullptr; -}; // end Polyhedron_demo_parameterization_plugin +}; // end CGAL_Lab_parameterization_plugin -void Polyhedron_demo_parameterization_plugin::on_prevButton_pressed() +void CGAL_Lab_parameterization_plugin::on_prevButton_pressed() { int id = scene->mainSelectionIndex(); for(UVItem* pl : projections) @@ -521,7 +521,7 @@ void Polyhedron_demo_parameterization_plugin::on_prevButton_pressed() replacePolyline(); } -void Polyhedron_demo_parameterization_plugin::on_nextButton_pressed() +void CGAL_Lab_parameterization_plugin::on_nextButton_pressed() { int id = scene->mainSelectionIndex(); for(UVItem* pl : projections) @@ -540,7 +540,7 @@ void Polyhedron_demo_parameterization_plugin::on_nextButton_pressed() replacePolyline(); } -void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterization_method method) +void CGAL_Lab_parameterization_plugin::parameterize(const Parameterization_method method) { // get active polyhedron Scene_facegraph_item* poly_item = nullptr; @@ -1002,49 +1002,49 @@ void Polyhedron_demo_parameterization_plugin::parameterize(const Parameterizatio } -void Polyhedron_demo_parameterization_plugin::on_actionMVC_triggered() +void CGAL_Lab_parameterization_plugin::on_actionMVC_triggered() { std::cerr << "MVC..."; parameterize(PARAM_MVC); } -void Polyhedron_demo_parameterization_plugin::on_actionDCP_triggered() +void CGAL_Lab_parameterization_plugin::on_actionDCP_triggered() { std::cerr << "DCP..."; parameterize(PARAM_DCP); } -void Polyhedron_demo_parameterization_plugin::on_actionLSC_triggered() +void CGAL_Lab_parameterization_plugin::on_actionLSC_triggered() { std::cerr << "LSC..."; parameterize(PARAM_LSC); } -void Polyhedron_demo_parameterization_plugin::on_actionDAP_triggered() +void CGAL_Lab_parameterization_plugin::on_actionDAP_triggered() { std::cerr << "DAP..."; parameterize(PARAM_DAP); } -void Polyhedron_demo_parameterization_plugin::on_actionIAP_triggered() +void CGAL_Lab_parameterization_plugin::on_actionIAP_triggered() { std::cerr << "IAP..."; parameterize(PARAM_IAP); } -void Polyhedron_demo_parameterization_plugin::on_actionARAP_triggered() +void CGAL_Lab_parameterization_plugin::on_actionARAP_triggered() { std::cerr << "ARAP..."; parameterize(PARAM_ARAP); } -void Polyhedron_demo_parameterization_plugin::on_actionOTE_triggered() +void CGAL_Lab_parameterization_plugin::on_actionOTE_triggered() { std::cerr << "OTE..."; parameterize(PARAM_OTE); } -void Polyhedron_demo_parameterization_plugin::on_actionBTP_triggered() +void CGAL_Lab_parameterization_plugin::on_actionBTP_triggered() { std::cerr << "BTP..."; parameterize(PARAM_BTP); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_widget.ui b/Lab/demo/Lab/Plugins/Surface_mesh/Parameterization_widget.ui similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_widget.ui rename to Lab/demo/Lab/Plugins/Surface_mesh/Parameterization_widget.ui index 07c61cca0419..f874ecaec164 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_widget.ui +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Parameterization_widget.ui @@ -48,7 +48,7 @@ - + :/cgal/icons/resources/left_arrow.png:/cgal/icons/resources/left_arrow.png @@ -69,7 +69,7 @@ - + :/cgal/icons/resources/right_arrow.png:/cgal/icons/resources/right_arrow.png @@ -80,7 +80,7 @@ - + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h b/Lab/demo/Lab/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h similarity index 98% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h rename to Lab/demo/Lab/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h index f9af8a8cfec4..91962532d808 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.h @@ -35,7 +35,7 @@ class SCENE_POLYHEDRON_SHORTEST_PATH_ITEM_EXPORT Scene_polyhedron_shortest_path_ { Q_OBJECT - friend class Polyhedron_demo_shortest_path_plugin; + friend class CGAL_Lab_shortest_path_plugin; public: typedef CGAL::Three::Scene_interface::Bbox Bbox; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Shortest_path_plugin.cpp similarity index 89% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Shortest_path_plugin.cpp index d6be0d38c6ad..7b2847666407 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Shortest_path_plugin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include @@ -26,13 +26,13 @@ typedef Scene_surface_mesh_item Scene_facegraph_item; typedef Scene_facegraph_item::Face_graph FaceGraph; using namespace CGAL::Three; -class Polyhedron_demo_shortest_path_plugin : +class CGAL_Lab_shortest_path_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") private: typedef boost::property_map::type VertexIndexMap; @@ -137,17 +137,17 @@ public Q_SLOTS: Ui::Shortest_path ui_widget; }; -Scene_polyhedron_shortest_path_item::Selection_mode Polyhedron_demo_shortest_path_plugin::get_selection_mode() const +Scene_polyhedron_shortest_path_item::Selection_mode CGAL_Lab_shortest_path_plugin::get_selection_mode() const { return (Scene_polyhedron_shortest_path_item::Selection_mode) ui_widget.Selection_type_combo_box->currentIndex(); } -Scene_polyhedron_shortest_path_item::Primitives_mode Polyhedron_demo_shortest_path_plugin::get_primitives_mode() const +Scene_polyhedron_shortest_path_item::Primitives_mode CGAL_Lab_shortest_path_plugin::get_primitives_mode() const { return (Scene_polyhedron_shortest_path_item::Primitives_mode) ui_widget.Primitives_type_combo_box->currentIndex(); } -void Polyhedron_demo_shortest_path_plugin::item_about_to_be_destroyed(CGAL::Three::Scene_item* sceneItem) +void CGAL_Lab_shortest_path_plugin::item_about_to_be_destroyed(CGAL::Three::Scene_item* sceneItem) { // if polyhedron item Scene_facegraph_item* polyhedronItem = qobject_cast(sceneItem); @@ -177,7 +177,7 @@ void Polyhedron_demo_shortest_path_plugin::item_about_to_be_destroyed(CGAL::Thre } } -void Polyhedron_demo_shortest_path_plugin::new_item(int itemIndex) +void CGAL_Lab_shortest_path_plugin::new_item(int itemIndex) { Scene_polyhedron_shortest_path_item* item = qobject_cast(scene->item(itemIndex)); @@ -230,7 +230,7 @@ void Polyhedron_demo_shortest_path_plugin::new_item(int itemIndex) m_shortestPathsMap.insert(std::make_pair(item->polyhedron_item(), item)); } -void Polyhedron_demo_shortest_path_plugin::on_actionMakeShortestPaths_triggered() +void CGAL_Lab_shortest_path_plugin::on_actionMakeShortestPaths_triggered() { Scene_facegraph_item* polyhedronItem = getSelectedItem(); if (polyhedronItem) @@ -258,7 +258,7 @@ void Polyhedron_demo_shortest_path_plugin::on_actionMakeShortestPaths_triggered( } } -void Polyhedron_demo_shortest_path_plugin::on_Selection_type_combo_box_changed(int index) +void CGAL_Lab_shortest_path_plugin::on_Selection_type_combo_box_changed(int index) { std::cout << "Selection mode changed: " << index << std::endl; @@ -268,7 +268,7 @@ void Polyhedron_demo_shortest_path_plugin::on_Selection_type_combo_box_changed(i } } -void Polyhedron_demo_shortest_path_plugin::on_Primitives_type_combo_box_changed(int index) +void CGAL_Lab_shortest_path_plugin::on_Primitives_type_combo_box_changed(int index) { std::cout << "Primitives mode changed: " << index << std::endl; @@ -278,7 +278,7 @@ void Polyhedron_demo_shortest_path_plugin::on_Primitives_type_combo_box_changed( } } -void Polyhedron_demo_shortest_path_plugin::check_and_set_ids(FaceGraph* polyhedron) +void CGAL_Lab_shortest_path_plugin::check_and_set_ids(FaceGraph* polyhedron) { typedef boost::graph_traits::vertex_iterator vertex_iterator; typedef boost::graph_traits::halfedge_iterator halfedge_iterator; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_widget.ui b/Lab/demo/Lab/Plugins/Surface_mesh/Shortest_path_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_widget.ui rename to Lab/demo/Lab/Plugins/Surface_mesh/Shortest_path_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui b/Lab/demo/Lab/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui rename to Lab/demo/Lab/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp index d0714d3f41b1..47fe1125b897 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp @@ -13,8 +13,8 @@ #include "Messages_interface.h" #include -#include -#include +#include +#include #include #include @@ -28,13 +28,13 @@ using namespace CGAL::Three; -class Polyhedron_demo_surface_mesh_approximation_plugin : +class CGAL_Lab_surface_mesh_approximation_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") typedef boost::property_map >::type Face_id_map; struct Patch_id_pmap @@ -63,7 +63,7 @@ class Polyhedron_demo_surface_mesh_approximation_plugin : typedef std::pair SM_wrapper_pair; public: - Polyhedron_demo_surface_mesh_approximation_plugin() { + CGAL_Lab_surface_mesh_approximation_plugin() { std::srand(time(nullptr)); } @@ -281,12 +281,12 @@ public Q_SLOTS: Messages_interface *mi; SM_wrapper_map m_sm_wrapper_map; -}; // end Polyhedron_demo_surface_mesh_approximation_plugin +}; // end CGAL_Lab_surface_mesh_approximation_plugin -void Polyhedron_demo_surface_mesh_approximation_plugin::on_actionSurfaceMeshApproximation_triggered() +void CGAL_Lab_surface_mesh_approximation_plugin::on_actionSurfaceMeshApproximation_triggered() { dock_widget->show(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonSeeding_clicked() { +void CGAL_Lab_surface_mesh_approximation_plugin::on_buttonSeeding_clicked() { const Scene_interface::Item_id sm_id = scene->mainSelectionIndex(); Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(sm_id)); @@ -356,7 +356,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonSeeding_clicked QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonFit_clicked() { +void CGAL_Lab_surface_mesh_approximation_plugin::on_buttonFit_clicked() { Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(scene->mainSelectionIndex())); if (!sm_item) { @@ -403,7 +403,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonFit_clicked() { QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonAdd_clicked() { +void CGAL_Lab_surface_mesh_approximation_plugin::on_buttonAdd_clicked() { Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(scene->mainSelectionIndex())); if (!sm_item) { @@ -454,7 +454,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonAdd_clicked() { QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonTeleport_clicked() { +void CGAL_Lab_surface_mesh_approximation_plugin::on_buttonTeleport_clicked() { Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(scene->mainSelectionIndex())); if (!sm_item) { @@ -505,7 +505,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonTeleport_clicke QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonSplit_clicked() { +void CGAL_Lab_surface_mesh_approximation_plugin::on_buttonSplit_clicked() { Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(scene->mainSelectionIndex())); if (!sm_item) { @@ -558,7 +558,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonSplit_clicked() QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonMeshing_clicked() { +void CGAL_Lab_surface_mesh_approximation_plugin::on_buttonMeshing_clicked() { Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(scene->mainSelectionIndex())); if (!sm_item) { @@ -627,7 +627,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonMeshing_clicked QApplication::restoreOverrideCursor(); } -void Polyhedron_demo_surface_mesh_approximation_plugin::on_comboMetric_currentIndexChanged(const int) { +void CGAL_Lab_surface_mesh_approximation_plugin::on_comboMetric_currentIndexChanged(const int) { Scene_surface_mesh_item *sm_item = qobject_cast( scene->item(scene->mainSelectionIndex())); if (!sm_item) { @@ -645,7 +645,7 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_comboMetric_currentIn scene->itemChanged(scene->item_id(sm_item)); } -void Polyhedron_demo_surface_mesh_approximation_plugin::itemAboutToBeDestroyed(CGAL::Three::Scene_item *scene_item) +void CGAL_Lab_surface_mesh_approximation_plugin::itemAboutToBeDestroyed(CGAL::Three::Scene_item *scene_item) { if (Scene_surface_mesh_item *sm_item = qobject_cast(scene_item)) { SM_wrapper_map::iterator search = m_sm_wrapper_map.find(sm_item); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h b/Lab/demo/Lab/Plugins/Surface_mesh/UVProjector.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h rename to Lab/demo/Lab/Plugins/Surface_mesh/UVProjector.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/VSA_wrapper.cpp b/Lab/demo/Lab/Plugins/Surface_mesh/VSA_wrapper.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/VSA_wrapper.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh/VSA_wrapper.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/VSA_wrapper.h b/Lab/demo/Lab/Plugins/Surface_mesh/VSA_wrapper.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/VSA_wrapper.h rename to Lab/demo/Lab/Plugins/Surface_mesh/VSA_wrapper.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt similarity index 88% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt index 2a90c0efba9f..ff58d6aaac05 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) if(TARGET CGAL::Eigen3_support AND "${EIGEN3_VERSION}" VERSION_GREATER "3.1.90") @@ -10,7 +10,7 @@ if(TARGET CGAL::Eigen3_support AND "${EIGEN3_VERSION}" VERSION_GREATER "3.1.90") scene_edit_item PUBLIC CGAL::Eigen3_support scene_surface_mesh_item scene_k_ring_selection scene_basic_objects) - polyhedron_demo_plugin(edit_plugin Edit_polyhedron_plugin Deform_mesh.ui) + cgal_lab_plugin(edit_plugin Edit_polyhedron_plugin Deform_mesh.ui) target_link_libraries(edit_plugin PUBLIC scene_surface_mesh_item scene_edit_item scene_selection_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Deform_mesh.ui b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Deform_mesh.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Deform_mesh.ui rename to Lab/demo/Lab/Plugins/Surface_mesh_deformation/Deform_mesh.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp similarity index 86% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp index 9f1c6b3ffb9a..c83ba2b196d1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Scene_surface_mesh_item.h" @@ -17,19 +17,19 @@ typedef Scene_surface_mesh_item Scene_facegraph_item; using namespace CGAL::Three; -class Polyhedron_demo_edit_polyhedron_plugin : +class CGAL_Lab_edit_cgal_lab_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: - Polyhedron_demo_edit_polyhedron_plugin() - : Polyhedron_demo_plugin_helper(), dock_widget(nullptr) + CGAL_Lab_edit_cgal_lab_plugin() + : CGAL_Lab_plugin_helper(), dock_widget(nullptr) { } - ~Polyhedron_demo_edit_polyhedron_plugin() + ~CGAL_Lab_edit_cgal_lab_plugin() { delete e_shortcut; } @@ -84,12 +84,12 @@ public Q_SLOTS: QAction* actionDeformation = nullptr; RenderingMode last_RM; QShortcut* e_shortcut = nullptr; -}; // end Polyhedron_demo_edit_polyhedron_plugin +}; // end CGAL_Lab_edit_cgal_lab_plugin -QList Polyhedron_demo_edit_polyhedron_plugin::actions() const { +QList CGAL_Lab_edit_cgal_lab_plugin::actions() const { return QList() << actionDeformation; } -bool Polyhedron_demo_edit_polyhedron_plugin::applicable(QAction*) const { +bool CGAL_Lab_edit_cgal_lab_plugin::applicable(QAction*) const { for(CGAL::Three::Scene_interface::Item_id i : scene->selectionIndices()) { if(qobject_cast(scene->item(i))) @@ -105,7 +105,7 @@ bool Polyhedron_demo_edit_polyhedron_plugin::applicable(QAction*) const { return false; } -void Polyhedron_demo_edit_polyhedron_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) +void CGAL_Lab_edit_cgal_lab_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { mw = mainWindow; scene = scene_interface; @@ -117,8 +117,8 @@ void Polyhedron_demo_edit_polyhedron_plugin::init(QMainWindow* mainWindow, CGAL: actionDeformation->setShortcutContext(Qt::ApplicationShortcut); autoConnectActions(); e_shortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_E), mw); - connect(e_shortcut, &QShortcut::activated, this, &Polyhedron_demo_edit_polyhedron_plugin::dispatchAction); - connect(e_shortcut, &QShortcut::activatedAmbiguously, this, &Polyhedron_demo_edit_polyhedron_plugin::dispatchAction); + connect(e_shortcut, &QShortcut::activated, this, &CGAL_Lab_edit_cgal_lab_plugin::dispatchAction); + connect(e_shortcut, &QShortcut::activatedAmbiguously, this, &CGAL_Lab_edit_cgal_lab_plugin::dispatchAction); // Connect Scene::newItem so that, if dock_widget is visible, convert // automatically polyhedron items to "edit polyhedron" items. @@ -164,7 +164,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::init(QMainWindow* mainWindow, CGAL: /////////////////////////////////////////////////////////////////// } -void Polyhedron_demo_edit_polyhedron_plugin::on_actionDeformation_triggered() +void CGAL_Lab_edit_cgal_lab_plugin::on_actionDeformation_triggered() { // dock widget should be constructed in init() if(dock_widget->isVisible()) { dock_widget->hide(); } @@ -173,7 +173,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_actionDeformation_triggered() /////// Dock window signal handlers ////// // what they do is simply transmitting required 'action' to selected scene_edit_polyhedron_item object -void Polyhedron_demo_edit_polyhedron_plugin::on_AddCtrlVertPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_AddCtrlVertPushButton_clicked() { int item_id = scene->selectionIndices().front(); @@ -182,7 +182,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_AddCtrlVertPushButton_clicked() edit_item->create_ctrl_vertices_group(); } -void Polyhedron_demo_edit_polyhedron_plugin::on_PrevCtrlVertPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_PrevCtrlVertPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -192,7 +192,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_PrevCtrlVertPushButton_clicked() edit_item->invalidateOpenGLBuffers(); scene->itemChanged(edit_item); // for repaint } -void Polyhedron_demo_edit_polyhedron_plugin::on_NextCtrlVertPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_NextCtrlVertPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -202,7 +202,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_NextCtrlVertPushButton_clicked() edit_item->invalidateOpenGLBuffers(); scene->itemChanged(edit_item); // for repaint } -void Polyhedron_demo_edit_polyhedron_plugin::on_SelectAllVerticesPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_SelectAllVerticesPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -212,7 +212,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_SelectAllVerticesPushButton_clic edit_item->invalidateOpenGLBuffers(); scene->itemChanged(edit_item); // for repaint } -void Polyhedron_demo_edit_polyhedron_plugin::on_DeleteCtrlVertPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_DeleteCtrlVertPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -223,7 +223,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_DeleteCtrlVertPushButton_clicked edit_item->invalidateOpenGLBuffers(); scene->itemChanged(edit_item); // for repaint } -void Polyhedron_demo_edit_polyhedron_plugin::on_ClearROIPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_ClearROIPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -233,11 +233,11 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ClearROIPushButton_clicked() edit_item->invalidateOpenGLBuffers(); scene->itemChanged(edit_item); // for repaint } -void Polyhedron_demo_edit_polyhedron_plugin::on_ApplyAndClosePushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_ApplyAndClosePushButton_clicked() { dock_widget->setVisible(false); } -void Polyhedron_demo_edit_polyhedron_plugin::on_DiscardChangesPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_DiscardChangesPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -247,7 +247,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_DiscardChangesPushButton_clicked edit_item->invalidateOpenGLBuffers(); scene->itemChanged(edit_item); //for redraw } -void Polyhedron_demo_edit_polyhedron_plugin::on_ShowROICheckBox_stateChanged(int /*state*/) +void CGAL_Lab_edit_cgal_lab_plugin::on_ShowROICheckBox_stateChanged(int /*state*/) { for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) { @@ -256,7 +256,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ShowROICheckBox_stateChanged(int scene->itemChanged(edit_item); // just for redraw } } -void Polyhedron_demo_edit_polyhedron_plugin::on_ShowAsSphereCheckBox_stateChanged(int state) +void CGAL_Lab_edit_cgal_lab_plugin::on_ShowAsSphereCheckBox_stateChanged(int state) { for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) { @@ -269,7 +269,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ShowAsSphereCheckBox_stateChange scene->itemChanged(edit_item); // just for redraw } } -void Polyhedron_demo_edit_polyhedron_plugin::on_ActivatePivotingCheckBox_stateChanged(int state) +void CGAL_Lab_edit_cgal_lab_plugin::on_ActivatePivotingCheckBox_stateChanged(int state) { for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) { @@ -285,7 +285,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ActivatePivotingCheckBox_stateCh scene->itemChanged(edit_item); } } -void Polyhedron_demo_edit_polyhedron_plugin::on_ActivateFixedPlaneCheckBox_stateChanged(int) +void CGAL_Lab_edit_cgal_lab_plugin::on_ActivateFixedPlaneCheckBox_stateChanged(int) { for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) { @@ -296,7 +296,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ActivateFixedPlaneCheckBox_state scene->itemChanged(edit_item); } } -void Polyhedron_demo_edit_polyhedron_plugin::on_OverwritePushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_OverwritePushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -304,7 +304,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_OverwritePushButton_clicked() edit_item->overwrite_deform_object(); } -void Polyhedron_demo_edit_polyhedron_plugin::on_Select_isolated_components_button_clicked() { +void CGAL_Lab_edit_cgal_lab_plugin::on_Select_isolated_components_button_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); if(!edit_item) return; // the selected item is not of the right type @@ -316,7 +316,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_Select_isolated_components_butto } } -void Polyhedron_demo_edit_polyhedron_plugin::on_Get_minimum_button_clicked() { +void CGAL_Lab_edit_cgal_lab_plugin::on_Get_minimum_button_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); if(!edit_item) return; // the selected item is not of the right type @@ -327,7 +327,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_Get_minimum_button_clicked() { } } -void Polyhedron_demo_edit_polyhedron_plugin::on_SaveROIPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_SaveROIPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -339,7 +339,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_SaveROIPushButton_clicked() edit_item->save_roi(fileName.toLocal8Bit().data()); } -void Polyhedron_demo_edit_polyhedron_plugin::on_ReadROIPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_ReadROIPushButton_clicked() { int item_id = scene->selectionIndices().front(); Scene_edit_polyhedron_item* edit_item = qobject_cast(scene->item(item_id)); @@ -355,7 +355,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ReadROIPushButton_clicked() } -void Polyhedron_demo_edit_polyhedron_plugin::dock_widget_visibility_changed(bool visible) +void CGAL_Lab_edit_cgal_lab_plugin::dock_widget_visibility_changed(bool visible) { if(!visible) { @@ -425,7 +425,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::dock_widget_visibility_changed(bool } -void Polyhedron_demo_edit_polyhedron_plugin::on_ROIRadioButton_toggled(bool value) { +void CGAL_Lab_edit_cgal_lab_plugin::on_ROIRadioButton_toggled(bool value) { int k_ring = value ? ui_widget.BrushSpinBoxRoi->value() : ui_widget.BrushSpinBoxCtrlVert->value(); for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) @@ -437,7 +437,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_ROIRadioButton_toggled(bool valu } } -void Polyhedron_demo_edit_polyhedron_plugin::on_BrushSpinBoxCtrlVert_changed(int value) { +void CGAL_Lab_edit_cgal_lab_plugin::on_BrushSpinBoxCtrlVert_changed(int value) { if(ui_widget.ROIRadioButton->isChecked()) { return; } for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) { @@ -448,7 +448,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_BrushSpinBoxCtrlVert_changed(int } } -void Polyhedron_demo_edit_polyhedron_plugin::on_BrushSpinBoxRoi_changed(int value) { +void CGAL_Lab_edit_cgal_lab_plugin::on_BrushSpinBoxRoi_changed(int value) { if(!ui_widget.ROIRadioButton->isChecked()) { return; } for(CGAL::Three::Scene_interface::Item_id i = 0, end = scene->numberOfEntries(); i < end; ++i) { @@ -460,7 +460,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::on_BrushSpinBoxRoi_changed(int valu } Scene_edit_polyhedron_item* -Polyhedron_demo_edit_polyhedron_plugin::convert_to_edit_facegraph(Item_id i, +CGAL_Lab_edit_cgal_lab_plugin::convert_to_edit_facegraph(Item_id i, Scene_facegraph_item* poly_item) { QString poly_item_name = poly_item->name(); @@ -481,7 +481,7 @@ Polyhedron_demo_edit_polyhedron_plugin::convert_to_edit_facegraph(Item_id i, } Scene_facegraph_item* -Polyhedron_demo_edit_polyhedron_plugin::convert_to_plain_facegraph(Item_id i, +CGAL_Lab_edit_cgal_lab_plugin::convert_to_plain_facegraph(Item_id i, Scene_edit_polyhedron_item* edit_item) { Scene_facegraph_item* poly_item = edit_item->to_sm_item(); @@ -491,7 +491,7 @@ Polyhedron_demo_edit_polyhedron_plugin::convert_to_plain_facegraph(Item_id i, } -void Polyhedron_demo_edit_polyhedron_plugin::on_importSelectionPushButton_clicked() +void CGAL_Lab_edit_cgal_lab_plugin::on_importSelectionPushButton_clicked() { Scene_polyhedron_selection_item* selection_item = nullptr; @@ -531,7 +531,7 @@ bool need_sel(true), need_edit(true); importSelection(selection_item, edit_item); } -void Polyhedron_demo_edit_polyhedron_plugin::importSelection(Scene_polyhedron_selection_item *selection_item, Scene_edit_polyhedron_item *edit_item) +void CGAL_Lab_edit_cgal_lab_plugin::importSelection(Scene_polyhedron_selection_item *selection_item, Scene_edit_polyhedron_item *edit_item) { //converts the selection in selected points @@ -575,7 +575,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::importSelection(Scene_polyhedron_se v->update(); } -void Polyhedron_demo_edit_polyhedron_plugin::updateSelectionItems(Scene_facegraph_item* target) +void CGAL_Lab_edit_cgal_lab_plugin::updateSelectionItems(Scene_facegraph_item* target) { for(int i = 0; inumberOfEntries(); i++) { @@ -597,7 +597,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::updateSelectionItems(Scene_facegrap } } -void Polyhedron_demo_edit_polyhedron_plugin::dispatchAction() +void CGAL_Lab_edit_cgal_lab_plugin::dispatchAction() { if(applicable(actionDeformation)) on_actionDeformation_triggered(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp rename to Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h similarity index 99% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h rename to Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h index c799d52b64ad..cd185bd797da 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h +++ b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.h @@ -249,7 +249,7 @@ class SCENE_EDIT_POLYHEDRON_ITEM_EXPORT Scene_edit_polyhedron_item public CGAL::Three::Scene_transparent_interface { Q_INTERFACES(CGAL::Three::Scene_transparent_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.TransparentInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.TransparentInterface/1.0") Q_OBJECT public: Scene_edit_polyhedron_item(){} //needed by the transparent interface diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item_config.h b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item_config.h rename to Lab/demo/Lab/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/CMakeLists.txt b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt similarity index 91% rename from Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt index 15dc949776e9..12faf5bd3d0d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt @@ -1,4 +1,4 @@ -include(polyhedron_demo_macros) +include(cgallab_macros) remove_definitions(-DQT_STATICPLUGIN) @@ -8,7 +8,7 @@ qt6_wrap_cpp(VOLUME_MOC_OUTFILES ${CMAKE_CURRENT_SOURCE_DIR}/Volume_plane_interface.h) qt6_wrap_ui(tetRemeshingUI_FILES Tetrahedral_remeshing_dialog.ui) -polyhedron_demo_plugin( +cgal_lab_plugin( tetrahedral_remeshing_plugin Tetrahedral_remeshing_plugin ${tetRemeshingUI_FILES} KEYWORDS Tetrahedral_remeshing) target_link_libraries(tetrahedral_remeshing_plugin PUBLIC scene_c3t3_item diff --git a/Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_dialog.ui b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_dialog.ui rename to Lab/demo/Lab/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp similarity index 95% rename from Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp rename to Lab/demo/Lab/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp index 0a75dbae932f..8448a8c310c6 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/Tetrahedral_remeshing_plugin.cpp @@ -7,7 +7,7 @@ #include -#include +#include #include "Scene_c3t3_item.h" #include "C3t3_type.h" @@ -45,13 +45,13 @@ std::size_t nb_test_midpoint = 0; #endif using namespace CGAL::Three; -class Polyhedron_demo_tetrahedral_remeshing_plugin : +class CGAL_Lab_tetrahedral_remeshing_plugin : public QObject, - public Polyhedron_demo_plugin_interface + public CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0" FILE "tetrahedral_remeshing_plugin.json") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0" FILE "tetrahedral_remeshing_plugin.json") public: void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*) @@ -239,6 +239,6 @@ public Q_SLOTS: private: QAction* actionTetrahedralRemeshing_; -}; // end Polyhedron_demo_tetrahedral_remeshing_plugin +}; // end CGAL_Lab_tetrahedral_remeshing_plugin #include "Tetrahedral_remeshing_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_dialog.ui b/Lab/demo/Lab/Plugins/Three_examples/Basic_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_dialog.ui rename to Lab/demo/Lab/Plugins/Three_examples/Basic_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_dock_widget.ui b/Lab/demo/Lab/Plugins/Three_examples/Basic_dock_widget.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_dock_widget.ui rename to Lab/demo/Lab/Plugins/Three_examples/Basic_dock_widget.ui diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_item_plugin.cpp b/Lab/demo/Lab/Plugins/Three_examples/Basic_item_plugin.cpp similarity index 90% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_item_plugin.cpp rename to Lab/demo/Lab/Plugins/Three_examples/Basic_item_plugin.cpp index 6aaaf519c940..f637c5ab053d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_item_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Three_examples/Basic_item_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -12,11 +12,11 @@ //adds a scene_plane_item to the scene, and adds the selected item and the plane to a new group. class BasicItemPlugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: //! [applicable] //This plugin is only applicable if there is exactly one selected item. diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_plugin.cpp b/Lab/demo/Lab/Plugins/Three_examples/Basic_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_plugin.cpp rename to Lab/demo/Lab/Plugins/Three_examples/Basic_plugin.cpp index 0edb4560030f..31a13f1315f3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Basic_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Three_examples/Basic_plugin.cpp @@ -7,7 +7,7 @@ Change the value of EXAMPLE_COMPLEXITY in the first line to change the behavior #define EXAMPLE_COMPLEXITY 0 #include "ui_Basic_dialog.h" //! [headers_plugin] -#include +#include #include #include #include @@ -36,11 +36,11 @@ class ComplexDialog : //This plugin creates an action in Operations depending on EXAMPLE_COMPLEXITY. class BasicPlugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: //decides if the plugin's actions will be displayed or not. bool applicable(QAction*) const override diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt b/Lab/demo/Lab/Plugins/Three_examples/CMakeLists.txt similarity index 76% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt rename to Lab/demo/Lab/Plugins/Three_examples/CMakeLists.txt index 23f8d5f89994..054890dd1f0e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Three_examples/CMakeLists.txt @@ -17,15 +17,15 @@ find_package(Qt6 QUIET OPTIONAL_COMPONENTS WebSockets) if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE) - polyhedron_demo_plugin(example_plugin Example_plugin) + cgal_lab_plugin(example_plugin Example_plugin) qt6_wrap_ui(basicUI_FILES Basic_dialog.ui) - polyhedron_demo_plugin(basic_plugin Basic_plugin ${basicUI_FILES}) + cgal_lab_plugin(basic_plugin Basic_plugin ${basicUI_FILES}) qt6_wrap_ui(dockUI_FILES Basic_dock_widget.ui) - polyhedron_demo_plugin(dock_widget_plugin Dock_widget_plugin ${dockUI_FILES}) + cgal_lab_plugin(dock_widget_plugin Dock_widget_plugin ${dockUI_FILES}) - polyhedron_demo_plugin(basic_item_plugin Basic_item_plugin) + cgal_lab_plugin(basic_item_plugin Basic_item_plugin) # links the library containing the scene_plane_item with the plugin target_link_libraries(basic_item_plugin PUBLIC scene_basic_objects) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Dock_widget_plugin.cpp b/Lab/demo/Lab/Plugins/Three_examples/Dock_widget_plugin.cpp similarity index 90% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Dock_widget_plugin.cpp rename to Lab/demo/Lab/Plugins/Three_examples/Dock_widget_plugin.cpp index 392b89540a25..18cacc932ba8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Dock_widget_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Three_examples/Dock_widget_plugin.cpp @@ -1,5 +1,5 @@ #include "ui_Basic_dock_widget.h" -#include +#include #include #include #include @@ -22,11 +22,11 @@ class DockWidget : //This plugin crates an action in Operations that creates a DOckWidget to display a number in the 'console' dockwidet. class BasicPlugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_helper + public CGAL::Three::CGAL_Lab_plugin_helper { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: //decides if the plugin's actions will be displayed or not. bool applicable(QAction*) const override diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Example_plugin.cpp b/Lab/demo/Lab/Plugins/Three_examples/Example_plugin.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Example_plugin.cpp rename to Lab/demo/Lab/Plugins/Three_examples/Example_plugin.cpp index ec18b4657542..52d0bba43835 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Example_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Three_examples/Example_plugin.cpp @@ -1,4 +1,4 @@ -//! \file Polyhedron_demo_example_plugin.cpp +//! \file CGAL_Lab_example_plugin.cpp #include #include @@ -137,17 +137,17 @@ void Scene_triangle_item::initializeBuffers(CGAL::Three::Viewer_interface *viewe vertices.shrink_to_fit(); } //! [fillbuffers] -#include +#include //The actual plugin using namespace CGAL::Three; -class Q_DECL_EXPORT Polyhedron_demo_example_plugin : +class Q_DECL_EXPORT CGAL_Lab_example_plugin : public QObject, - public Polyhedron_demo_plugin_helper + public CGAL_Lab_plugin_helper { //Configures CMake to use MOC correctly Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public : @@ -188,6 +188,6 @@ public Q_SLOTS: CGAL::Three::Scene_item* triangle; QList _actions; -}; //end of class Polyhedron_demo_example_plugin +}; //end of class CGAL_Lab_example_plugin #include "Example_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Group_item_plugin.cpp b/Lab/demo/Lab/Plugins/Three_examples/Group_item_plugin.cpp similarity index 89% rename from Polyhedron/demo/Polyhedron/Plugins/Three_examples/Group_item_plugin.cpp rename to Lab/demo/Lab/Plugins/Three_examples/Group_item_plugin.cpp index 1f247de9c5d4..2b6f5ddc3d5f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Three_examples/Group_item_plugin.cpp +++ b/Lab/demo/Lab/Plugins/Three_examples/Group_item_plugin.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -10,11 +10,11 @@ //This plugin crates an action in Operations that displays "Hello World" in the 'console' dockwidet. class GroupItemPlugin : public QObject, - public CGAL::Three::Polyhedron_demo_plugin_interface + public CGAL::Three::CGAL_Lab_plugin_interface { Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") public: //This plugin is only applicable if there is at exactly one selected item. bool applicable(QAction*) const diff --git a/Polyhedron/demo/Polyhedron/Point_container.cpp b/Lab/demo/Lab/Point_container.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Point_container.cpp rename to Lab/demo/Lab/Point_container.cpp diff --git a/Polyhedron/demo/Polyhedron/Point_dialog_config.h b/Lab/demo/Lab/Point_dialog_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Point_dialog_config.h rename to Lab/demo/Lab/Point_dialog_config.h diff --git a/Polyhedron/demo/Polyhedron/Preferences.ui b/Lab/demo/Lab/Preferences.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Preferences.ui rename to Lab/demo/Lab/Preferences.ui diff --git a/Polyhedron/demo/Polyhedron/Primitive_container.cpp b/Lab/demo/Lab/Primitive_container.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Primitive_container.cpp rename to Lab/demo/Lab/Primitive_container.cpp diff --git a/Polyhedron/demo/Polyhedron/SMesh_type.h b/Lab/demo/Lab/SMesh_type.h similarity index 100% rename from Polyhedron/demo/Polyhedron/SMesh_type.h rename to Lab/demo/Lab/SMesh_type.h diff --git a/Polyhedron/demo/Polyhedron/SSH_dialog.ui b/Lab/demo/Lab/SSH_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/SSH_dialog.ui rename to Lab/demo/Lab/SSH_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Scene.cpp b/Lab/demo/Lab/Scene.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene.cpp rename to Lab/demo/Lab/Scene.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene.h b/Lab/demo/Lab/Scene.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene.h rename to Lab/demo/Lab/Scene.h diff --git a/Polyhedron/demo/Polyhedron/Scene_basic_objects_config.h b/Lab/demo/Lab/Scene_basic_objects_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_basic_objects_config.h rename to Lab/demo/Lab/Scene_basic_objects_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp b/Lab/demo/Lab/Scene_c3t3_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_c3t3_item.cpp rename to Lab/demo/Lab/Scene_c3t3_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item.h b/Lab/demo/Lab/Scene_c3t3_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_c3t3_item.h rename to Lab/demo/Lab/Scene_c3t3_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_c3t3_item_config.h b/Lab/demo/Lab/Scene_c3t3_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_c3t3_item_config.h rename to Lab/demo/Lab/Scene_c3t3_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_config.h b/Lab/demo/Lab/Scene_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_config.h rename to Lab/demo/Lab/Scene_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_find_items.h b/Lab/demo/Lab/Scene_find_items.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_find_items.h rename to Lab/demo/Lab/Scene_find_items.h diff --git a/Polyhedron/demo/Polyhedron/Scene_group_item.cpp b/Lab/demo/Lab/Scene_group_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_group_item.cpp rename to Lab/demo/Lab/Scene_group_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item.cpp b/Lab/demo/Lab/Scene_image_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_image_item.cpp rename to Lab/demo/Lab/Scene_image_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item.h b/Lab/demo/Lab/Scene_image_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_image_item.h rename to Lab/demo/Lab/Scene_image_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_image_item_config.h b/Lab/demo/Lab/Scene_image_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_image_item_config.h rename to Lab/demo/Lab/Scene_image_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp b/Lab/demo/Lab/Scene_implicit_function_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_implicit_function_item.cpp rename to Lab/demo/Lab/Scene_implicit_function_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h b/Lab/demo/Lab/Scene_implicit_function_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h rename to Lab/demo/Lab/Scene_implicit_function_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item_config.h b/Lab/demo/Lab/Scene_implicit_function_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_implicit_function_item_config.h rename to Lab/demo/Lab/Scene_implicit_function_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_item.cpp b/Lab/demo/Lab/Scene_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_item.cpp rename to Lab/demo/Lab/Scene_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_item_rendering_helper.cpp b/Lab/demo/Lab/Scene_item_rendering_helper.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_item_rendering_helper.cpp rename to Lab/demo/Lab/Scene_item_rendering_helper.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_item_with_properties.cpp b/Lab/demo/Lab/Scene_item_with_properties.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_item_with_properties.cpp rename to Lab/demo/Lab/Scene_item_with_properties.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_lcc_item.cpp b/Lab/demo/Lab/Scene_lcc_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_lcc_item.cpp rename to Lab/demo/Lab/Scene_lcc_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_lcc_item.h b/Lab/demo/Lab/Scene_lcc_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_lcc_item.h rename to Lab/demo/Lab/Scene_lcc_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp b/Lab/demo/Lab/Scene_nef_polyhedron_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp rename to Lab/demo/Lab/Scene_nef_polyhedron_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h b/Lab/demo/Lab/Scene_nef_polyhedron_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h rename to Lab/demo/Lab/Scene_nef_polyhedron_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item_config.h b/Lab/demo/Lab/Scene_nef_polyhedron_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item_config.h rename to Lab/demo/Lab/Scene_nef_polyhedron_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_plane_item.cpp b/Lab/demo/Lab/Scene_plane_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_plane_item.cpp rename to Lab/demo/Lab/Scene_plane_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_plane_item.h b/Lab/demo/Lab/Scene_plane_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_plane_item.h rename to Lab/demo/Lab/Scene_plane_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp b/Lab/demo/Lab/Scene_points_with_normal_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp rename to Lab/demo/Lab/Scene_points_with_normal_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h b/Lab/demo/Lab/Scene_points_with_normal_item.h similarity index 97% rename from Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h rename to Lab/demo/Lab/Scene_points_with_normal_item.h index 05a7723b3eb6..d3eebed8e995 100644 --- a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h +++ b/Lab/demo/Lab/Scene_points_with_normal_item.h @@ -32,7 +32,7 @@ class SCENE_POINTS_WITH_NORMAL_ITEM_EXPORT Scene_points_with_normal_item { Q_OBJECT Q_INTERFACES(CGAL::Three::Scene_zoomable_item_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.ZoomInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.ZoomInterface/1.0") public: Scene_points_with_normal_item(); diff --git a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item_config.h b/Lab/demo/Lab/Scene_points_with_normal_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_points_with_normal_item_config.h rename to Lab/demo/Lab/Scene_points_with_normal_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Lab/demo/Lab/Scene_polygon_soup_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp rename to Lab/demo/Lab/Scene_polygon_soup_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h b/Lab/demo/Lab/Scene_polygon_soup_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h rename to Lab/demo/Lab/Scene_polygon_soup_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item_config.h b/Lab/demo/Lab/Scene_polygon_soup_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polygon_soup_item_config.h rename to Lab/demo/Lab/Scene_polygon_soup_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator.cpp b/Lab/demo/Lab/Scene_polyhedron_item_decorator.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator.cpp rename to Lab/demo/Lab/Scene_polyhedron_item_decorator.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator.h b/Lab/demo/Lab/Scene_polyhedron_item_decorator.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator.h rename to Lab/demo/Lab/Scene_polyhedron_item_decorator.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator_config.h b/Lab/demo/Lab/Scene_polyhedron_item_decorator_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_item_decorator_config.h rename to Lab/demo/Lab/Scene_polyhedron_item_decorator_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp b/Lab/demo/Lab/Scene_polyhedron_selection_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp rename to Lab/demo/Lab/Scene_polyhedron_selection_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h b/Lab/demo/Lab/Scene_polyhedron_selection_item.h similarity index 99% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h rename to Lab/demo/Lab/Scene_polyhedron_selection_item.h index a65e7adf764b..ff58bf5a6587 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h +++ b/Lab/demo/Lab/Scene_polyhedron_selection_item.h @@ -13,7 +13,7 @@ #include #include -#include "Polyhedron_demo_detect_sharp_edges.h" +#include "CGAL_Lab_detect_sharp_edges.h" // Laurent Rineau, 2016/04/07: that header should not be included here, but // only in the .cpp file. But that header file does contain the body of a @@ -193,9 +193,9 @@ class SCENE_POLYHEDRON_SELECTION_ITEM_EXPORT Scene_polyhedron_selection_item { Q_OBJECT Q_INTERFACES(CGAL::Three::Scene_print_item_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PrintInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PrintInterface/1.0") -friend class Polyhedron_demo_selection_plugin; +friend class CGAL_Lab_selection_plugin; public: typedef boost::graph_traits::face_descriptor fg_face_descriptor; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item_config.h b/Lab/demo/Lab/Scene_polyhedron_selection_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item_config.h rename to Lab/demo/Lab/Scene_polyhedron_selection_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item_config.h b/Lab/demo/Lab/Scene_polyhedron_shortest_path_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item_config.h rename to Lab/demo/Lab/Scene_polyhedron_shortest_path_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp b/Lab/demo/Lab/Scene_polylines_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp rename to Lab/demo/Lab/Scene_polylines_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.h b/Lab/demo/Lab/Scene_polylines_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polylines_item.h rename to Lab/demo/Lab/Scene_polylines_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item_config.h b/Lab/demo/Lab/Scene_polylines_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_polylines_item_config.h rename to Lab/demo/Lab/Scene_polylines_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_spheres_item.cpp b/Lab/demo/Lab/Scene_spheres_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_spheres_item.cpp rename to Lab/demo/Lab/Scene_spheres_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_spheres_item.h b/Lab/demo/Lab/Scene_spheres_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_spheres_item.h rename to Lab/demo/Lab/Scene_spheres_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Lab/demo/Lab/Scene_surface_mesh_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp rename to Lab/demo/Lab/Scene_surface_mesh_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h b/Lab/demo/Lab/Scene_surface_mesh_item.h similarity index 97% rename from Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h rename to Lab/demo/Lab/Scene_surface_mesh_item.h index 555f57f5fd53..31e0f1951eb2 100644 --- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.h +++ b/Lab/demo/Lab/Scene_surface_mesh_item.h @@ -38,10 +38,10 @@ class SCENE_SURFACE_MESH_ITEM_EXPORT Scene_surface_mesh_item public CGAL::Three::Scene_print_item_interface { Q_INTERFACES(CGAL::Three::Scene_print_item_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PrintInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PrintInterface/1.0") Q_OBJECT Q_INTERFACES(CGAL::Three::Scene_zoomable_item_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.ZoomInterface/1.0") + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.ZoomInterface/1.0") public: typedef SMesh Face_graph; diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item_config.h b/Lab/demo/Lab/Scene_surface_mesh_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_surface_mesh_item_config.h rename to Lab/demo/Lab/Scene_surface_mesh_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Scene_tetrahedra_item.cpp b/Lab/demo/Lab/Scene_tetrahedra_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_tetrahedra_item.cpp rename to Lab/demo/Lab/Scene_tetrahedra_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_tetrahedra_item.h b/Lab/demo/Lab/Scene_tetrahedra_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_tetrahedra_item.h rename to Lab/demo/Lab/Scene_tetrahedra_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp b/Lab/demo/Lab/Scene_textured_polyhedron_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.cpp rename to Lab/demo/Lab/Scene_textured_polyhedron_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp b/Lab/demo/Lab/Scene_textured_surface_mesh_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.cpp rename to Lab/demo/Lab/Scene_textured_surface_mesh_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.h b/Lab/demo/Lab/Scene_textured_surface_mesh_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_textured_surface_mesh_item.h rename to Lab/demo/Lab/Scene_textured_surface_mesh_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp b/Lab/demo/Lab/Scene_triangulation_3_item.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.cpp rename to Lab/demo/Lab/Scene_triangulation_3_item.cpp diff --git a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h b/Lab/demo/Lab/Scene_triangulation_3_item.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_triangulation_3_item.h rename to Lab/demo/Lab/Scene_triangulation_3_item.h diff --git a/Polyhedron/demo/Polyhedron/Scene_triangulation_3_item_config.h b/Lab/demo/Lab/Scene_triangulation_3_item_config.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Scene_triangulation_3_item_config.h rename to Lab/demo/Lab/Scene_triangulation_3_item_config.h diff --git a/Polyhedron/demo/Polyhedron/Selection_visualizer.h b/Lab/demo/Lab/Selection_visualizer.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Selection_visualizer.h rename to Lab/demo/Lab/Selection_visualizer.h diff --git a/Polyhedron/demo/Polyhedron/Server_ws.cpp b/Lab/demo/Lab/Server_ws.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Server_ws.cpp rename to Lab/demo/Lab/Server_ws.cpp diff --git a/Polyhedron/demo/Polyhedron/Server_ws.h b/Lab/demo/Lab/Server_ws.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Server_ws.h rename to Lab/demo/Lab/Server_ws.h diff --git a/Polyhedron/demo/Polyhedron/Show_point_dialog.cpp b/Lab/demo/Lab/Show_point_dialog.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Show_point_dialog.cpp rename to Lab/demo/Lab/Show_point_dialog.cpp diff --git a/Polyhedron/demo/Polyhedron/Show_point_dialog.h b/Lab/demo/Lab/Show_point_dialog.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Show_point_dialog.h rename to Lab/demo/Lab/Show_point_dialog.h diff --git a/Polyhedron/demo/Polyhedron/Show_point_dialog.ui b/Lab/demo/Lab/Show_point_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Show_point_dialog.ui rename to Lab/demo/Lab/Show_point_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/Statistics_on_item_dialog.ui b/Lab/demo/Lab/Statistics_on_item_dialog.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Statistics_on_item_dialog.ui rename to Lab/demo/Lab/Statistics_on_item_dialog.ui diff --git a/Polyhedron/demo/Polyhedron/SubViewer.ui b/Lab/demo/Lab/SubViewer.ui similarity index 94% rename from Polyhedron/demo/Polyhedron/SubViewer.ui rename to Lab/demo/Lab/SubViewer.ui index 62a56d47ccc9..d27796c3ed87 100644 --- a/Polyhedron/demo/Polyhedron/SubViewer.ui +++ b/Lab/demo/Lab/SubViewer.ui @@ -60,7 +60,7 @@ - + :/cgal/icons/resources/exit.png:/cgal/icons/resources/exit.png @@ -81,8 +81,8 @@ - - + + diff --git a/Polyhedron/demo/Polyhedron/T3_type.h b/Lab/demo/Lab/T3_type.h similarity index 100% rename from Polyhedron/demo/Polyhedron/T3_type.h rename to Lab/demo/Lab/T3_type.h diff --git a/Polyhedron/demo/Polyhedron/TODO b/Lab/demo/Lab/TODO similarity index 100% rename from Polyhedron/demo/Polyhedron/TODO rename to Lab/demo/Lab/TODO diff --git a/Polyhedron/demo/Polyhedron/TextRenderer.cpp b/Lab/demo/Lab/TextRenderer.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/TextRenderer.cpp rename to Lab/demo/Lab/TextRenderer.cpp diff --git a/Polyhedron/demo/Polyhedron/Three.cpp b/Lab/demo/Lab/Three.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Three.cpp rename to Lab/demo/Lab/Three.cpp index 8e6b8943e15d..84c7c19ae1af 100644 --- a/Polyhedron/demo/Polyhedron/Three.cpp +++ b/Lab/demo/Lab/Three.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include #include @@ -112,7 +112,7 @@ void Three::addDockWidget(QDockWidget* dock_widget) } -void Three::autoConnectActions(Polyhedron_demo_plugin_interface *plugin) +void Three::autoConnectActions(CGAL_Lab_plugin_interface *plugin) { QObject* thisObject = dynamic_cast(plugin); if(!thisObject) diff --git a/Polyhedron/demo/Polyhedron/Travel_isolated_components.h b/Lab/demo/Lab/Travel_isolated_components.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Travel_isolated_components.h rename to Lab/demo/Lab/Travel_isolated_components.h diff --git a/Polyhedron/demo/Polyhedron/Triangle_container.cpp b/Lab/demo/Lab/Triangle_container.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/Triangle_container.cpp rename to Lab/demo/Lab/Triangle_container.cpp diff --git a/Lab/demo/Lab/UseCGAL_Lab.cmake b/Lab/demo/Lab/UseCGAL_Lab.cmake new file mode 100644 index 000000000000..bb2fd14877de --- /dev/null +++ b/Lab/demo/Lab/UseCGAL_Lab.cmake @@ -0,0 +1,12 @@ +message(STATUS "Using CGAL Lab from: ${CGAL_LAB_DEMO_DIR}") + +list(INSERT CMAKE_MODULE_PATH 0 "${CGAL_LAB_DEMO_CMAKE_MODULE_PATH}") + +message(STATUS "Now CMAKE_MODULE_PATH is: ${CMAKE_MODULE_PATH}") + +include( cgallab_macros ) +include( cgal_lab_targets ) + + +include_directories( ${CGAL_LAB_DEMO_HEADERS_DIRS} ) +add_definitions(${CGAL_LAB_DEMO_DEFINITIONS}) diff --git a/Polyhedron/demo/Polyhedron/Use_ssh.cpp b/Lab/demo/Lab/Use_ssh.cpp similarity index 98% rename from Polyhedron/demo/Polyhedron/Use_ssh.cpp rename to Lab/demo/Lab/Use_ssh.cpp index a4495160fbc7..a4bcbddd6d57 100644 --- a/Polyhedron/demo/Polyhedron/Use_ssh.cpp +++ b/Lab/demo/Lab/Use_ssh.cpp @@ -408,16 +408,16 @@ bool explore_the_galaxy(ssh_session &session, { std::string sbuf(buffer, nbytes); - if(sbuf.find("Polyhedron_demo_") != std::string::npos) + if(sbuf.find("CGAL_Lab_") != std::string::npos) { std::istringstream iss(sbuf); std::string file; while(iss >> file) { - if(file.find("Polyhedron_demo_") != std::string::npos) + if(file.find("CGAL_Lab_") != std::string::npos) { QString name(file.c_str()); - files.push_back(name.remove("Polyhedron_demo_")); + files.push_back(name.remove("CGAL_Lab_")); } } } diff --git a/Polyhedron/demo/Polyhedron/Viewer.cpp b/Lab/demo/Lab/Viewer.cpp similarity index 90% rename from Polyhedron/demo/Polyhedron/Viewer.cpp rename to Lab/demo/Lab/Viewer.cpp index ac0ab4fb27f9..70c2b60e8385 100644 --- a/Polyhedron/demo/Polyhedron/Viewer.cpp +++ b/Lab/demo/Lab/Viewer.cpp @@ -1199,23 +1199,23 @@ QOpenGLShaderProgram* Viewer::declare_program(int name, } if(isOpenGL_4_3()) { - if(strcmp(f_shader,":/cgal/Polyhedron_3/resources/shader_flat.frag" ) == 0) + if(strcmp(f_shader,":/cgal/Lab/resources/shader_flat.frag" ) == 0) { - if(!program->addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/shader_flat.geom" )) + if(!program->addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Lab/resources/shader_flat.geom" )) { std::cerr<<"adding geometry shader FAILED"<addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/solid_wireframe_shader.geom" )) + if(!program->addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Lab/resources/solid_wireframe_shader.geom" )) { std::cerr<<"adding geometry shader FAILED"<addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Polyhedron_3/resources/no_interpolation_shader.geom" )) + if(!program->addShaderFromSourceFile(QOpenGLShader::Geometry,":/cgal/Lab/resources/no_interpolation_shader.geom" )) { std::cerr<<"adding geometry shader FAILED"<setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasCutPlane", true); @@ -1249,9 +1249,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_C3T3_EDGES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_c3t3_edges.vert" , ":/cgal/Polyhedron_3/resources/shader_c3t3_edges.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_edges.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_edges.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_c3t3_edges.vert" , ":/cgal/Lab/resources/shader_c3t3_edges.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_c3t3_edges.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_c3t3_edges.frag"); program->setProperty("hasCutPlane", true); program->setProperty("hasSurfaceMode", true); program->setProperty("hasSubdomainIndicesValues", true); @@ -1260,9 +1260,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_WITH_LIGHT: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_light.vert" , ":/cgal/Polyhedron_3/resources/shader_with_light.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_with_light.vert" , ":/cgal/Lab/resources/shader_with_light.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_with_light.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_with_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasTransparency", true); @@ -1272,9 +1272,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_HEAT_INTENSITY: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/heat_intensity_shader.vert" , ":/cgal/Polyhedron_3/resources/heat_intensity_shader.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/heat_intensity_shader.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/heat_intensity_shader.frag"); + ? declare_program(name, ":/cgal/Lab/resources/heat_intensity_shader.vert" , ":/cgal/Lab/resources/heat_intensity_shader.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/heat_intensity_shader.vert" , + ":/cgal/Lab/resources/compatibility_shaders/heat_intensity_shader.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasTransparency", true); @@ -1284,18 +1284,18 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_WITHOUT_LIGHT: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.vert" , ":/cgal/Polyhedron_3/resources/shader_without_light.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_without_light.vert" , ":/cgal/Lab/resources/shader_without_light.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_without_light.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_without_light.frag"); program->setProperty("hasFMatrix", true); return program; } case PROGRAM_NO_SELECTION: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.vert" , ":/cgal/Polyhedron_3/resources/shader_no_light_no_selection.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_no_light_no_selection.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_without_light.vert" , ":/cgal/Lab/resources/shader_no_light_no_selection.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_without_light.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_no_light_no_selection.frag"); program->setProperty("hasFMatrix", true); program->setProperty("hasTransparency", true); return program; @@ -1303,9 +1303,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_WITH_TEXTURE: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_texture.vert" , ":/cgal/Polyhedron_3/resources/shader_with_texture.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_texture.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_texture.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_with_texture.vert" , ":/cgal/Lab/resources/shader_with_texture.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_with_texture.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_with_texture.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasFMatrix", true); @@ -1315,9 +1315,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_PLANE_TWO_FACES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_without_light.vert" , ":/cgal/Polyhedron_3/resources/shader_plane_two_faces.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_plane_two_faces.frag"); + ?declare_program(name, ":/cgal/Lab/resources/shader_without_light.vert" , ":/cgal/Lab/resources/shader_plane_two_faces.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_without_light.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_plane_two_faces.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasFMatrix", true); @@ -1326,9 +1326,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_WITH_TEXTURED_EDGES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_textured_edges.vert" , ":/cgal/Polyhedron_3/resources/shader_with_textured_edges.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_textured_edges.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_textured_edges.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_with_textured_edges.vert" , ":/cgal/Lab/resources/shader_with_textured_edges.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_with_textured_edges.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_with_textured_edges.frag"); program->setProperty("hasFMatrix", true); program->setProperty("hasTexture", true); return program; @@ -1336,9 +1336,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_INSTANCED: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_instanced.vert" , ":/cgal/Polyhedron_3/resources/shader_with_light.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_instanced.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_instanced.vert" , ":/cgal/Lab/resources/shader_with_light.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_instanced.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_with_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); @@ -1348,9 +1348,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_INSTANCED_WIRE: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_instanced.vert" , ":/cgal/Polyhedron_3/resources/shader_without_light.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_instanced.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_without_light.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_instanced.vert" , ":/cgal/Lab/resources/shader_without_light.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_instanced.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_without_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasCenter", true); @@ -1360,9 +1360,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_CUTPLANE_SPHERES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_c3t3_spheres.vert" , ":/cgal/Polyhedron_3/resources/shader_c3t3_spheres.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_spheres.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_c3t3_spheres.frag"); + ? declare_program(name, ":/cgal/Lab/resources/shader_c3t3_spheres.vert" , ":/cgal/Lab/resources/shader_c3t3_spheres.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_c3t3_spheres.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_c3t3_spheres.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasCenter", true); @@ -1374,9 +1374,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_SPHERES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_spheres.vert" , ":/cgal/Polyhedron_3/resources/shader_with_light.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_spheres.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.frag"); + ?declare_program(name, ":/cgal/Lab/resources/shader_spheres.vert" , ":/cgal/Lab/resources/shader_with_light.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_spheres.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_with_light.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasCenter", true); @@ -1389,9 +1389,9 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_DARK_SPHERES: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ?declare_program(name, ":/cgal/Polyhedron_3/resources/shader_dark_spheres.vert" , ":/cgal/Polyhedron_3/resources/shader_no_light_no_selection.frag") - : declare_program(name, ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_dark_spheres.vert" , - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_no_light_no_selection.frag"); + ?declare_program(name, ":/cgal/Lab/resources/shader_dark_spheres.vert" , ":/cgal/Lab/resources/shader_no_light_no_selection.frag") + : declare_program(name, ":/cgal/Lab/resources/compatibility_shaders/shader_dark_spheres.vert" , + ":/cgal/Lab/resources/compatibility_shaders/shader_no_light_no_selection.frag"); program->setProperty("hasCenter", true); program->setProperty("hasRadius", true); program->setProperty("isInstanced", true); @@ -1405,7 +1405,7 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const std::cerr<<"An OpenGL context of version 4.3 is required for the program ("<setProperty("hasLight", true); program->setProperty("hasNormals", true); return program; @@ -1413,10 +1413,10 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const case PROGRAM_OLD_FLAT: { QOpenGLShaderProgram* program = isOpenGL_4_3() - ? declare_program(name, ":/cgal/Polyhedron_3/resources/shader_with_light.vert", ":/cgal/Polyhedron_3/resources/shader_old_flat.frag") + ? declare_program(name, ":/cgal/Lab/resources/shader_with_light.vert", ":/cgal/Lab/resources/shader_old_flat.frag") : declare_program(name, - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_with_light.vert", - ":/cgal/Polyhedron_3/resources/compatibility_shaders/shader_old_flat.frag"); + ":/cgal/Lab/resources/compatibility_shaders/shader_with_light.vert", + ":/cgal/Lab/resources/compatibility_shaders/shader_old_flat.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); return program; @@ -1429,8 +1429,8 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const return nullptr; } QOpenGLShaderProgram* program = declare_program(name, - ":/cgal/Polyhedron_3/resources/solid_wireframe_shader.vert", - ":/cgal/Polyhedron_3/resources/solid_wireframe_shader.frag"); + ":/cgal/Lab/resources/solid_wireframe_shader.vert", + ":/cgal/Lab/resources/solid_wireframe_shader.frag"); program->setProperty("hasViewport", true); program->setProperty("hasWidth", true); program->setProperty("hasFMatrix", true); @@ -1444,8 +1444,8 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const return nullptr; } QOpenGLShaderProgram* program = declare_program(name, - ":/cgal/Polyhedron_3/resources/no_interpolation_shader.vert", - ":/cgal/Polyhedron_3/resources/no_interpolation_shader.frag"); + ":/cgal/Lab/resources/no_interpolation_shader.vert", + ":/cgal/Lab/resources/no_interpolation_shader.frag"); program->setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("drawLinesAdjacency", true); @@ -1458,7 +1458,7 @@ QOpenGLShaderProgram* Viewer::getShaderProgram(int name) const std::cerr<<"An OpenGL context of version 4.3 is required for the program ("<setProperty("hasLight", true); program->setProperty("hasNormals", true); program->setProperty("hasDistanceValues", true); diff --git a/Polyhedron/demo/Polyhedron/Viewer.h b/Lab/demo/Lab/Viewer.h similarity index 100% rename from Polyhedron/demo/Polyhedron/Viewer.h rename to Lab/demo/Lab/Viewer.h diff --git a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake b/Lab/demo/Lab/cgal_test_with_cmake similarity index 97% rename from Polyhedron/demo/Polyhedron/cgal_test_with_cmake rename to Lab/demo/Lab/cgal_test_with_cmake index 59eb5c1d0211..db9893ba9c36 100755 --- a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake +++ b/Lab/demo/Lab/cgal_test_with_cmake @@ -102,7 +102,7 @@ demo_framework \ gl_splat \ point_dialog \ Polyhedron_3 \ -polyhedron_demo \ +cgal_lab \ scene_basic_objects \ scene_color_ramp \ scene_c2t3_item \ @@ -129,7 +129,7 @@ basic_generator_plugin \ c3t3_io_plugin \ camera_positions_plugin \ classification_plugin \ -clip_polyhedron_plugin \ +clip_cgal_lab_plugin \ convex_hull_plugin \ corefinement_plugin \ create_bbox_mesh_plugin \ @@ -138,7 +138,7 @@ detect_sharp_edges_plugin \ detect_sharp_edges_sm_plugin \ distance_plugin \ distance_sm_plugin \ -edit_polyhedron_plugin \ +edit_cgal_lab_plugin \ edit_sm_plugin \ extrude_poly_plugin \ extrude_sm_plugin \ @@ -178,7 +178,7 @@ parameterization_plugin \ pca_plugin \ p_klein_function_plugin \ ply_to_xyz_plugin \ -point_inside_polyhedron_plugin \ +point_inside_cgal_lab_plugin \ point_set_average_spacing_plugin \ point_set_bilateral_smoothing_plugin \ point_set_from_vertices_plugin \ @@ -197,7 +197,7 @@ polylines_io_plugin \ p_sphere_function_plugin \ p_tanglecube_function_plugin \ random_perturbation_plugin \ -repair_polyhedron_plugin \ +repair_cgal_lab_plugin \ selection_io_plugin \ selection_sm_io_plugin \ selection_plugin \ @@ -210,7 +210,7 @@ subdivision_methods_plugin \ surface_mesh_io_plugin \ surface_reconstruction_plugin \ surf_to_sm_io_plugin \ -transform_polyhedron_plugin \ +transform_cgal_lab_plugin \ triangulate_facets_plugin \ trivial_plugin \ vtk_plugin \ diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp b/Lab/demo/Lab/cgallab.cpp similarity index 65% rename from Polyhedron/demo/Polyhedron/Polyhedron_3.cpp rename to Lab/demo/Lab/cgallab.cpp index 7376a4758904..b071acb98172 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_3.cpp +++ b/Lab/demo/Lab/cgallab.cpp @@ -1,4 +1,4 @@ -#include "Polyhedron_demo.h" +#include "cgallab.h" /*! * \brief defines the entry point of the demo. @@ -6,8 +6,8 @@ */ int main(int argc, char **argv) { - Polyhedron_demo app(argc, argv, + CGAL_Lab app(argc, argv, "Polyhedron_3 demo", - "CGAL Polyhedron Demo"); + "CGAL Lab"); return app.try_exec(); } diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo.h b/Lab/demo/Lab/cgallab.h similarity index 63% rename from Polyhedron/demo/Polyhedron/Polyhedron_demo.h rename to Lab/demo/Lab/cgallab.h index c913249c7aa2..82af7c6607d9 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo.h +++ b/Lab/demo/Lab/cgallab.h @@ -1,30 +1,30 @@ -#ifndef POLYHEDRON_DEMO_H -#define POLYHEDRON_DEMO_H +#ifndef LAB_DEMO_H +#define LAB_DEMO_H #include -#include "Polyhedron_demo_config.h" +#include "cgallab_config.h" #include #include #include -struct Polyhedron_demo_impl; +struct CGAL_Lab_impl; -class POLYHEDRON_DEMO_EXPORT Polyhedron_demo : public QApplication +class LAB_DEMO_EXPORT CGAL_Lab : public QApplication { bool d_ptr_is_initialized; /// can be false during a call to `notify()` - QScopedPointer d_ptr; + QScopedPointer d_ptr; public: /*! * Constructor : calls the constructor of QApplication */ - Polyhedron_demo(int& argc, char **argv, + CGAL_Lab(int& argc, char **argv, QString application_name = "Polyhedron_3 demo", - QString main_window_title = "CGAL Polyhedron demo", + QString main_window_title = "CGAL Lab", QStringList input_keywords = QStringList()); - ~Polyhedron_demo(); + ~CGAL_Lab(); /*! * Catches unhandled exceptions from all the widgets @@ -39,6 +39,6 @@ class POLYHEDRON_DEMO_EXPORT Polyhedron_demo : public QApplication /*! Call `QApplication::exec()` unless the main window is already closed */ int try_exec(); -}; // end class Polyhedron_demo +}; // end class CGAL_Lab -#endif // POLYHEDRON_DEMO_H +#endif // LAB_DEMO_H diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc b/Lab/demo/Lab/cgallab.qrc similarity index 99% rename from Polyhedron/demo/Polyhedron/Polyhedron_3.qrc rename to Lab/demo/Lab/cgallab.qrc index 8b31d1ee17dd..97c9edb5c687 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_3.qrc +++ b/Lab/demo/Lab/cgallab.qrc @@ -37,7 +37,7 @@ resources/pause.jpeg resources/reset.jpg - + resources/about.html resources/shader_with_light.vert resources/shader_with_light.frag diff --git a/Lab/demo/Lab/cgallabConfig.cmake.in b/Lab/demo/Lab/cgallabConfig.cmake.in new file mode 100644 index 000000000000..78f0634aa62b --- /dev/null +++ b/Lab/demo/Lab/cgallabConfig.cmake.in @@ -0,0 +1,7 @@ +set(CGAL_LAB_DEMO_CMAKE_MODULE_PATH "@CMAKE_CURRENT_SOURCE_DIR@;@CMAKE_CURRENT_BINARY_DIR@") +set(CGAL_LAB_DEMO_DEFINITIONS "@CGAL_LAB_DEMO_DEFINITIONS@") +set(CGAL_LAB_DEMO_HEADERS_DIRS "@CMAKE_CURRENT_SOURCE_DIR@;@CMAKE_CURRENT_SOURCE_DIR@/include;@CMAKE_CURRENT_SOURCE_DIR@/CGAL_demo") +set(CGAL_LAB_DEMO_DIR "@CMAKE_CURRENT_BINARY_DIR@") +set(CGAL_LAB_DEMO_PLUGINS_DIR "@CGAL_LAB_DEMO_PLUGINS_DIR@") +set(CGAL_LAB_DEMO_USE_FILE "@CMAKE_CURRENT_SOURCE_DIR@/UseCGAL_Lab.cmake") +set(cgal_lab_FOUND TRUE) diff --git a/Lab/demo/Lab/cgallab_config.h b/Lab/demo/Lab/cgallab_config.h new file mode 100644 index 000000000000..08ef409a90c0 --- /dev/null +++ b/Lab/demo/Lab/cgallab_config.h @@ -0,0 +1,10 @@ +#ifndef LAB_DEMO_CONFIG_H +#define LAB_DEMO_CONFIG_H + +#ifdef cgal_lab_EXPORTS +# define LAB_DEMO_EXPORT Q_DECL_EXPORT +#else +# define LAB_DEMO_EXPORT Q_DECL_IMPORT +#endif + +#endif // LAB_DEMO_CONFIG_H diff --git a/Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake b/Lab/demo/Lab/cgallab_macros.cmake similarity index 91% rename from Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake rename to Lab/demo/Lab/cgallab_macros.cmake index aaea742ca1d3..39bf0c6c7f7a 100644 --- a/Polyhedron/demo/Polyhedron/polyhedron_demo_macros.cmake +++ b/Lab/demo/Lab/cgallab_macros.cmake @@ -1,7 +1,7 @@ include(AddFileDependencies) include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) - macro(polyhedron_demo_plugin plugin_name plugin_implementation_base_name) + macro(cgal_lab_plugin plugin_name plugin_implementation_base_name) cmake_parse_arguments(ARG "" "" "KEYWORDS" ${ARGN}) list_split(option ARGN_TAIL ${ARG_UNPARSED_ARGUMENTS} ) if(NOT ${option} STREQUAL "EXCLUDE_FROM_ALL") @@ -26,7 +26,7 @@ include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) add_library(${plugin_name} MODULE ${option} ${moc_file_name} ${plugin_implementation_base_name}.cpp ${other_sources}) set_property(TARGET ${plugin_name} PROPERTY LIBRARY_OUTPUT_DIRECTORY - "${CGAL_POLYHEDRON_DEMO_PLUGINS_DIR}") + "${CGAL_LAB_DEMO_PLUGINS_DIR}") cgal_add_compilation_test(${plugin_name}) add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${plugin_name} ) # Link with Qt @@ -36,8 +36,8 @@ include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) target_link_libraries( ${plugin_name} PUBLIC demo_framework) add_dependencies(${plugin_name} demo_framework) else() - target_link_libraries( ${plugin_name} PUBLIC Polyhedron_demo_framework) - add_dependencies(${plugin_name} Polyhedron_demo_framework) + target_link_libraries( ${plugin_name} PUBLIC CGAL_Lab_framework) + add_dependencies(${plugin_name} CGAL_Lab_framework) endif() if(TARGET "compilation_of__demo_framework" AND TEST "compilation of ${plugin_name}") set_property(TEST "compilation of ${plugin_name}" APPEND PROPERTY FIXTURES_REQUIRED demo_framework_SetupFixture) @@ -82,4 +82,4 @@ include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) file(APPEND ${filename} "\"ConfigDate\" : \"${VERSION}\" }") endif() CGAL_install_hooks() - endmacro(polyhedron_demo_plugin) + endmacro(cgal_lab_plugin) diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp b/Lab/demo/Lab/cgallab_plugin_helper.cpp similarity index 93% rename from Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp rename to Lab/demo/Lab/cgallab_plugin_helper.cpp index 10d78ec8583f..c98acbf62daa 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_plugin_helper.cpp +++ b/Lab/demo/Lab/cgallab_plugin_helper.cpp @@ -1,11 +1,11 @@ -#include +#include #include #include #include #include -void CGAL::Three::Polyhedron_demo_plugin_helper::addDockWidget(QDockWidget* dock_widget) +void CGAL::Three::CGAL_Lab_plugin_helper::addDockWidget(QDockWidget* dock_widget) { mw->addDockWidget(::Qt::LeftDockWidgetArea, dock_widget); dock_widget->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred)); @@ -25,7 +25,7 @@ void CGAL::Three::Polyhedron_demo_plugin_helper::addDockWidget(QDockWidget* dock } -void CGAL::Three::Polyhedron_demo_plugin_helper::autoConnectActions() +void CGAL::Three::CGAL_Lab_plugin_helper::autoConnectActions() { QObject* thisObject = dynamic_cast(this); if(!thisObject) diff --git a/Polyhedron/demo/Polyhedron/concurrent_mesher_config.cfg b/Lab/demo/Lab/concurrent_mesher_config.cfg similarity index 100% rename from Polyhedron/demo/Polyhedron/concurrent_mesher_config.cfg rename to Lab/demo/Lab/concurrent_mesher_config.cfg diff --git a/Lab/demo/Lab/config.h b/Lab/demo/Lab/config.h new file mode 100644 index 000000000000..3014cb7519d5 --- /dev/null +++ b/Lab/demo/Lab/config.h @@ -0,0 +1,25 @@ +// #define CGAL_LAB_DEMO_NO_NEF +// #define CGAL_LAB_DEMO_NO_SURFACE_MESHER +// #define CGAL_LAB_DEMO_NO_PARAMETRIZATION + +#ifndef CGAL_LAB_DEMO_CONFIG_H +#define CGAL_LAB_DEMO_CONFIG_H + +#ifdef CGAL_USE_SSH +//to avoid clashing between windows.h and winsock2.h +#define _WINSOCKAPI_ +#endif + +#ifndef CGAL_LAB_DEMO_NO_PARAMETRIZATION +# define CGAL_LAB_DEMO_USE_PARAMETRIZATION +#endif + +#ifndef CGAL_LAB_DEMO_NO_NEF +# define CGAL_LAB_DEMO_USE_NEF +#endif + +#ifndef CGAL_LAB_DEMO_NO_SURFACE_MESHER +# define CGAL_LAB_DEMO_USE_SURFACE_MESHER +#endif + +#endif // CGAL_LAB_DEMO_CONFIG_H diff --git a/Polyhedron/demo/Polyhedron/create_sphere.h b/Lab/demo/Lab/create_sphere.h similarity index 98% rename from Polyhedron/demo/Polyhedron/create_sphere.h rename to Lab/demo/Lab/create_sphere.h index c2fd27266d12..ec74f49de88b 100644 --- a/Polyhedron/demo/Polyhedron/create_sphere.h +++ b/Lab/demo/Lab/create_sphere.h @@ -1,5 +1,5 @@ -#ifndef POLYHEDRON_DEMO_CREATE_SPHERE_H -#define POLYHEDRON_DEMO_CREATE_SPHERE_H +#ifndef LAB_DEMO_CREATE_SPHERE_H +#define LAB_DEMO_CREATE_SPHERE_H #include #include @@ -363,4 +363,4 @@ void create_flat_and_wire_sphere(FLOAT R, } } -#endif //POLYHEDRON_DEMO_DRAW_SPHERE_H +#endif //LAB_DEMO_DRAW_SPHERE_H diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt b/Lab/demo/Lab/implicit_functions/CMakeLists.txt similarity index 87% rename from Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt rename to Lab/demo/Lab/implicit_functions/CMakeLists.txt index 174535ff5d5e..80c86129ce63 100644 --- a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt +++ b/Lab/demo/Lab/implicit_functions/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1...3.23) -include(polyhedron_demo_macros) +include(cgallab_macros) if(NOT POLICY CMP0070 AND POLICY CMP0053) # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. @@ -36,11 +36,11 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND) include(AddFileDependencies) remove_definitions(-DQT_STATICPLUGIN) - polyhedron_demo_plugin(p_sphere_function_plugin Sphere_implicit_function + cgal_lab_plugin(p_sphere_function_plugin Sphere_implicit_function KEYWORDS Mesh_3) - polyhedron_demo_plugin(p_tanglecube_function_plugin + cgal_lab_plugin(p_tanglecube_function_plugin Tanglecube_implicit_function KEYWORDS Mesh_3) - polyhedron_demo_plugin(p_klein_function_plugin Klein_implicit_function + cgal_lab_plugin(p_klein_function_plugin Klein_implicit_function KEYWORDS Mesh_3) else(CGAL_Qt6_FOUND AND Qt6_FOUND) diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/Implicit_function_interface.h b/Lab/demo/Lab/implicit_functions/Implicit_function_interface.h similarity index 100% rename from Polyhedron/demo/Polyhedron/implicit_functions/Implicit_function_interface.h rename to Lab/demo/Lab/implicit_functions/Implicit_function_interface.h diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/Klein_implicit_function.cpp b/Lab/demo/Lab/implicit_functions/Klein_implicit_function.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/implicit_functions/Klein_implicit_function.cpp rename to Lab/demo/Lab/implicit_functions/Klein_implicit_function.cpp diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/Sphere_implicit_function.cpp b/Lab/demo/Lab/implicit_functions/Sphere_implicit_function.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/implicit_functions/Sphere_implicit_function.cpp rename to Lab/demo/Lab/implicit_functions/Sphere_implicit_function.cpp diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/Tanglecube_implicit_function.cpp b/Lab/demo/Lab/implicit_functions/Tanglecube_implicit_function.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/implicit_functions/Tanglecube_implicit_function.cpp rename to Lab/demo/Lab/implicit_functions/Tanglecube_implicit_function.cpp diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Dualizer.h b/Lab/demo/Lab/include/CGAL/Dualizer.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Dualizer.h rename to Lab/demo/Lab/include/CGAL/Dualizer.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Facet_with_id_pmap.h b/Lab/demo/Lab/include/CGAL/Facet_with_id_pmap.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Facet_with_id_pmap.h rename to Lab/demo/Lab/include/CGAL/Facet_with_id_pmap.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h b/Lab/demo/Lab/include/CGAL/IO/read_surf_trianglemesh.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/IO/read_surf_trianglemesh.h rename to Lab/demo/Lab/include/CGAL/IO/read_surf_trianglemesh.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Make_bar.h b/Lab/demo/Lab/include/CGAL/Make_bar.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Make_bar.h rename to Lab/demo/Lab/include/CGAL/Make_bar.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Make_quad_soup.h b/Lab/demo/Lab/include/CGAL/Make_quad_soup.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Make_quad_soup.h rename to Lab/demo/Lab/include/CGAL/Make_quad_soup.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Make_triangle_soup.h b/Lab/demo/Lab/include/CGAL/Make_triangle_soup.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Make_triangle_soup.h rename to Lab/demo/Lab/include/CGAL/Make_triangle_soup.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Polyhedron_kernel.h b/Lab/demo/Lab/include/CGAL/Polyhedron_kernel.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Polyhedron_kernel.h rename to Lab/demo/Lab/include/CGAL/Polyhedron_kernel.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Textured_polyhedron_builder.h b/Lab/demo/Lab/include/CGAL/Textured_polyhedron_builder.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Textured_polyhedron_builder.h rename to Lab/demo/Lab/include/CGAL/Textured_polyhedron_builder.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/Use_ssh.h b/Lab/demo/Lab/include/CGAL/Use_ssh.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/Use_ssh.h rename to Lab/demo/Lab/include/CGAL/Use_ssh.h diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/statistics_helpers.h b/Lab/demo/Lab/include/CGAL/statistics_helpers.h similarity index 98% rename from Polyhedron/demo/Polyhedron/include/CGAL/statistics_helpers.h rename to Lab/demo/Lab/include/CGAL/statistics_helpers.h index fcb98812e87e..fb4785f30214 100644 --- a/Polyhedron/demo/Polyhedron/include/CGAL/statistics_helpers.h +++ b/Lab/demo/Lab/include/CGAL/statistics_helpers.h @@ -1,5 +1,5 @@ -#ifndef POLYHEDRON_DEMO_STATISTICS_HELPERS_H -#define POLYHEDRON_DEMO_STATISTICS_HELPERS_H +#ifndef LAB_DEMO_STATISTICS_HELPERS_H +#define LAB_DEMO_STATISTICS_HELPERS_H #include #include @@ -275,4 +275,4 @@ void faces_aspect_ratio(Mesh* poly, { faces_aspect_ratio(poly, faces(*poly), min_altitude, mini, maxi, mean); } -#endif // POLYHEDRON_DEMO_STATISTICS_HELPERS_H +#endif // LAB_DEMO_STATISTICS_HELPERS_H diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/textured_polyhedron.h b/Lab/demo/Lab/include/CGAL/textured_polyhedron.h similarity index 99% rename from Polyhedron/demo/Polyhedron/include/CGAL/textured_polyhedron.h rename to Lab/demo/Lab/include/CGAL/textured_polyhedron.h index d4047adc199f..df9b58a3986e 100644 --- a/Polyhedron/demo/Polyhedron/include/CGAL/textured_polyhedron.h +++ b/Lab/demo/Lab/include/CGAL/textured_polyhedron.h @@ -2,7 +2,7 @@ #define _TEXTURED_MESH_ #include -#include +#include #include diff --git a/Polyhedron/demo/Polyhedron/include/CGAL/translate.h b/Lab/demo/Lab/include/CGAL/translate.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/CGAL/translate.h rename to Lab/demo/Lab/include/CGAL/translate.h diff --git a/Polyhedron/demo/Polyhedron/include/Point_set_3.h b/Lab/demo/Lab/include/Point_set_3.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/Point_set_3.h rename to Lab/demo/Lab/include/Point_set_3.h diff --git a/Polyhedron/demo/Polyhedron/include/Progress_bar_callback.h b/Lab/demo/Lab/include/Progress_bar_callback.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/Progress_bar_callback.h rename to Lab/demo/Lab/include/Progress_bar_callback.h diff --git a/Polyhedron/demo/Polyhedron/include/QMultipleInputDialog.h b/Lab/demo/Lab/include/QMultipleInputDialog.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/QMultipleInputDialog.h rename to Lab/demo/Lab/include/QMultipleInputDialog.h diff --git a/Polyhedron/demo/Polyhedron/include/Qt_progress_bar_callback.h b/Lab/demo/Lab/include/Qt_progress_bar_callback.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/Qt_progress_bar_callback.h rename to Lab/demo/Lab/include/Qt_progress_bar_callback.h diff --git a/Polyhedron/demo/Polyhedron/include/UI_point_3.h b/Lab/demo/Lab/include/UI_point_3.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/UI_point_3.h rename to Lab/demo/Lab/include/UI_point_3.h diff --git a/Polyhedron/demo/Polyhedron/include/id_printing.h b/Lab/demo/Lab/include/id_printing.h similarity index 99% rename from Polyhedron/demo/Polyhedron/include/id_printing.h rename to Lab/demo/Lab/include/id_printing.h index 2bf10a371c09..0c1bc5b0abb6 100644 --- a/Polyhedron/demo/Polyhedron/include/id_printing.h +++ b/Lab/demo/Lab/include/id_printing.h @@ -1,5 +1,5 @@ -#ifndef CGAL_POLYHEDRON_DEMO_ID_PRINTING_H -#define CGAL_POLYHEDRON_DEMO_ID_PRINTING_H +#ifndef CGAL_LAB_DEMO_ID_PRINTING_H +#define CGAL_LAB_DEMO_ID_PRINTING_H #include #include @@ -762,5 +762,5 @@ int zoomToPoint(const PointSet& ps, return 0; } -#endif // CGAL_POLYHEDRON_DEMO_ID_PRINTING_H +#endif // CGAL_LAB_DEMO_ID_PRINTING_H diff --git a/Polyhedron/demo/Polyhedron/include/run_with_qprogressdialog.h b/Lab/demo/Lab/include/run_with_qprogressdialog.h similarity index 100% rename from Polyhedron/demo/Polyhedron/include/run_with_qprogressdialog.h rename to Lab/demo/Lab/include/run_with_qprogressdialog.h diff --git a/Polyhedron/demo/Polyhedron/javascript/lib.js b/Lab/demo/Lab/javascript/lib.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/lib.js rename to Lab/demo/Lab/javascript/lib.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/bad/catch_and_retrow_cpp_exception.js b/Lab/demo/Lab/javascript/tests/bad/catch_and_retrow_cpp_exception.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/bad/catch_and_retrow_cpp_exception.js rename to Lab/demo/Lab/javascript/tests/bad/catch_and_retrow_cpp_exception.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/bad/include_missing_file.js b/Lab/demo/Lab/javascript/tests/bad/include_missing_file.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/bad/include_missing_file.js rename to Lab/demo/Lab/javascript/tests/bad/include_missing_file.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/bad/syntax_error.js b/Lab/demo/Lab/javascript/tests/bad/syntax_error.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/bad/syntax_error.js rename to Lab/demo/Lab/javascript/tests/bad/syntax_error.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/bad/throw_error.js b/Lab/demo/Lab/javascript/tests/bad/throw_error.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/bad/throw_error.js rename to Lab/demo/Lab/javascript/tests/bad/throw_error.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/bad/uncaught_cpp_exception.js b/Lab/demo/Lab/javascript/tests/bad/uncaught_cpp_exception.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/bad/uncaught_cpp_exception.js rename to Lab/demo/Lab/javascript/tests/bad/uncaught_cpp_exception.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/bad/uncaught_cpp_exception_in_an_include.js b/Lab/demo/Lab/javascript/tests/bad/uncaught_cpp_exception_in_an_include.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/bad/uncaught_cpp_exception_in_an_include.js rename to Lab/demo/Lab/javascript/tests/bad/uncaught_cpp_exception_in_an_include.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/good/catch_missing_file.js b/Lab/demo/Lab/javascript/tests/good/catch_missing_file.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/good/catch_missing_file.js rename to Lab/demo/Lab/javascript/tests/good/catch_missing_file.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/good/caught_cpp_exception_in_an_include.js b/Lab/demo/Lab/javascript/tests/good/caught_cpp_exception_in_an_include.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/good/caught_cpp_exception_in_an_include.js rename to Lab/demo/Lab/javascript/tests/good/caught_cpp_exception_in_an_include.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/good/cpp_exception.js b/Lab/demo/Lab/javascript/tests/good/cpp_exception.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/good/cpp_exception.js rename to Lab/demo/Lab/javascript/tests/good/cpp_exception.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/good/cpp_exception_from_a_function.js b/Lab/demo/Lab/javascript/tests/good/cpp_exception_from_a_function.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/good/cpp_exception_from_a_function.js rename to Lab/demo/Lab/javascript/tests/good/cpp_exception_from_a_function.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/good/cpp_exception_in_an_include.js b/Lab/demo/Lab/javascript/tests/good/cpp_exception_in_an_include.js similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/good/cpp_exception_in_an_include.js rename to Lab/demo/Lab/javascript/tests/good/cpp_exception_in_an_include.js diff --git a/Polyhedron/demo/Polyhedron/javascript/tests/run-tests.sh b/Lab/demo/Lab/javascript/tests/run-tests.sh similarity index 100% rename from Polyhedron/demo/Polyhedron/javascript/tests/run-tests.sh rename to Lab/demo/Lab/javascript/tests/run-tests.sh diff --git a/Polyhedron/demo/Polyhedron/properties.h b/Lab/demo/Lab/properties.h similarity index 70% rename from Polyhedron/demo/Polyhedron/properties.h rename to Lab/demo/Lab/properties.h index 15f1d1224a8a..b6ceb7e6a016 100644 --- a/Polyhedron/demo/Polyhedron/properties.h +++ b/Lab/demo/Lab/properties.h @@ -1,5 +1,5 @@ -#ifndef CGAL_POLYHEDRON_DEMO_PROPERTIES_H -#define CGAL_POLYHEDRON_DEMO_PROPERTIES_H +#ifndef CGAL_LAB_DEMO_PROPERTIES_H +#define CGAL_LAB_DEMO_PROPERTIES_H namespace CGAL { diff --git a/Polyhedron/demo/Polyhedron/resources/about.html b/Lab/demo/Lab/resources/about.html similarity index 91% rename from Polyhedron/demo/Polyhedron/resources/about.html rename to Lab/demo/Lab/resources/about.html index b881e30bab79..8c32ab3cfd9e 100644 --- a/Polyhedron/demo/Polyhedron/resources/about.html +++ b/Lab/demo/Lab/resources/about.html @@ -1,6 +1,6 @@ -

3D Polyhedral Surfaces

+

CGAL Lab

Copyright ©2008-2009 GeometryFactory and INRIA Sophia Antipolis - Mediterranee

diff --git a/Polyhedron/demo/Polyhedron/resources/add_facet1.png b/Lab/demo/Lab/resources/add_facet1.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/add_facet1.png rename to Lab/demo/Lab/resources/add_facet1.png diff --git a/Polyhedron/demo/Polyhedron/resources/add_facet2.png b/Lab/demo/Lab/resources/add_facet2.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/add_facet2.png rename to Lab/demo/Lab/resources/add_facet2.png diff --git a/Polyhedron/demo/Polyhedron/resources/back.png b/Lab/demo/Lab/resources/back.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/back.png rename to Lab/demo/Lab/resources/back.png diff --git a/Polyhedron/demo/Polyhedron/resources/boolean-diff.png b/Lab/demo/Lab/resources/boolean-diff.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/boolean-diff.png rename to Lab/demo/Lab/resources/boolean-diff.png diff --git a/Polyhedron/demo/Polyhedron/resources/boolean-intersection.png b/Lab/demo/Lab/resources/boolean-intersection.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/boolean-intersection.png rename to Lab/demo/Lab/resources/boolean-intersection.png diff --git a/Polyhedron/demo/Polyhedron/resources/boolean-union.png b/Lab/demo/Lab/resources/boolean-union.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/boolean-union.png rename to Lab/demo/Lab/resources/boolean-union.png diff --git a/Polyhedron/demo/Polyhedron/resources/bot.png b/Lab/demo/Lab/resources/bot.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/bot.png rename to Lab/demo/Lab/resources/bot.png diff --git a/Polyhedron/demo/Polyhedron/resources/cgal_logo.xpm b/Lab/demo/Lab/resources/cgal_logo.xpm similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/cgal_logo.xpm rename to Lab/demo/Lab/resources/cgal_logo.xpm diff --git a/Polyhedron/demo/Polyhedron/resources/check-off.png b/Lab/demo/Lab/resources/check-off.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/check-off.png rename to Lab/demo/Lab/resources/check-off.png diff --git a/Polyhedron/demo/Polyhedron/resources/check-off.svg b/Lab/demo/Lab/resources/check-off.svg similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/check-off.svg rename to Lab/demo/Lab/resources/check-off.svg diff --git a/Polyhedron/demo/Polyhedron/resources/check-on.png b/Lab/demo/Lab/resources/check-on.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/check-on.png rename to Lab/demo/Lab/resources/check-on.png diff --git a/Polyhedron/demo/Polyhedron/resources/check.svg b/Lab/demo/Lab/resources/check.svg similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/check.svg rename to Lab/demo/Lab/resources/check.svg diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/heat_intensity_shader.frag b/Lab/demo/Lab/resources/compatibility_shaders/heat_intensity_shader.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/heat_intensity_shader.frag rename to Lab/demo/Lab/resources/compatibility_shaders/heat_intensity_shader.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/heat_intensity_shader.vert b/Lab/demo/Lab/resources/compatibility_shaders/heat_intensity_shader.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/heat_intensity_shader.vert rename to Lab/demo/Lab/resources/compatibility_shaders/heat_intensity_shader.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_edges.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_edges.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_edges.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_edges.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_edges.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_edges.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_edges.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_edges.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_spheres.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_spheres.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_spheres.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_spheres.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_spheres.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_spheres.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_c3t3_spheres.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_c3t3_spheres.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_dark_spheres.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_dark_spheres.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_dark_spheres.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_dark_spheres.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_instanced.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_instanced.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_instanced.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_instanced.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_no_light_no_selection.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_no_light_no_selection.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_no_light_no_selection.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_no_light_no_selection.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_old_flat.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_old_flat.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_old_flat.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_old_flat.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_plane_two_faces.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_plane_two_faces.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_plane_two_faces.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_plane_two_faces.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_spheres.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_spheres.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_spheres.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_light.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_with_light.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_light.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_with_light.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_light.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_with_light.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_light.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_with_light.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_texture.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_with_texture.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_texture.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_with_texture.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_texture.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_with_texture.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_texture.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_with_texture.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_textured_edges.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_with_textured_edges.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_textured_edges.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_with_textured_edges.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_textured_edges.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_with_textured_edges.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_with_textured_edges.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_with_textured_edges.vert diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_without_light.frag b/Lab/demo/Lab/resources/compatibility_shaders/shader_without_light.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_without_light.frag rename to Lab/demo/Lab/resources/compatibility_shaders/shader_without_light.frag diff --git a/Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_without_light.vert b/Lab/demo/Lab/resources/compatibility_shaders/shader_without_light.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/compatibility_shaders/shader_without_light.vert rename to Lab/demo/Lab/resources/compatibility_shaders/shader_without_light.vert diff --git a/Polyhedron/demo/Polyhedron/resources/convex-hull.png b/Lab/demo/Lab/resources/convex-hull.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/convex-hull.png rename to Lab/demo/Lab/resources/convex-hull.png diff --git a/Polyhedron/demo/Polyhedron/resources/down.png b/Lab/demo/Lab/resources/down.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/down.png rename to Lab/demo/Lab/resources/down.png diff --git a/Polyhedron/demo/Polyhedron/resources/editcopy.png b/Lab/demo/Lab/resources/editcopy.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/editcopy.png rename to Lab/demo/Lab/resources/editcopy.png diff --git a/Polyhedron/demo/Polyhedron/resources/euler_center.png b/Lab/demo/Lab/resources/euler_center.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/euler_center.png rename to Lab/demo/Lab/resources/euler_center.png diff --git a/Polyhedron/demo/Polyhedron/resources/euler_facet.png b/Lab/demo/Lab/resources/euler_facet.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/euler_facet.png rename to Lab/demo/Lab/resources/euler_facet.png diff --git a/Polyhedron/demo/Polyhedron/resources/euler_vertex.png b/Lab/demo/Lab/resources/euler_vertex.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/euler_vertex.png rename to Lab/demo/Lab/resources/euler_vertex.png diff --git a/Polyhedron/demo/Polyhedron/resources/exit.png b/Lab/demo/Lab/resources/exit.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/exit.png rename to Lab/demo/Lab/resources/exit.png diff --git a/Polyhedron/demo/Polyhedron/resources/front.png b/Lab/demo/Lab/resources/front.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/front.png rename to Lab/demo/Lab/resources/front.png diff --git a/Polyhedron/demo/Polyhedron/resources/general_collapse.png b/Lab/demo/Lab/resources/general_collapse.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/general_collapse.png rename to Lab/demo/Lab/resources/general_collapse.png diff --git a/Polyhedron/demo/Polyhedron/resources/grid.png b/Lab/demo/Lab/resources/grid.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/grid.png rename to Lab/demo/Lab/resources/grid.png diff --git a/Polyhedron/demo/Polyhedron/resources/heat_intensity_shader.frag b/Lab/demo/Lab/resources/heat_intensity_shader.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/heat_intensity_shader.frag rename to Lab/demo/Lab/resources/heat_intensity_shader.frag diff --git a/Polyhedron/demo/Polyhedron/resources/heat_intensity_shader.vert b/Lab/demo/Lab/resources/heat_intensity_shader.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/heat_intensity_shader.vert rename to Lab/demo/Lab/resources/heat_intensity_shader.vert diff --git a/Polyhedron/demo/Polyhedron/resources/help_button.png b/Lab/demo/Lab/resources/help_button.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/help_button.png rename to Lab/demo/Lab/resources/help_button.png diff --git a/Polyhedron/demo/Polyhedron/resources/hexahedron.png b/Lab/demo/Lab/resources/hexahedron.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/hexahedron.png rename to Lab/demo/Lab/resources/hexahedron.png diff --git a/Polyhedron/demo/Polyhedron/resources/icosphere.png b/Lab/demo/Lab/resources/icosphere.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/icosphere.png rename to Lab/demo/Lab/resources/icosphere.png diff --git a/Polyhedron/demo/Polyhedron/resources/kernel.png b/Lab/demo/Lab/resources/kernel.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/kernel.png rename to Lab/demo/Lab/resources/kernel.png diff --git a/Polyhedron/demo/Polyhedron/resources/left.png b/Lab/demo/Lab/resources/left.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/left.png rename to Lab/demo/Lab/resources/left.png diff --git a/Polyhedron/demo/Polyhedron/resources/left_arrow.png b/Lab/demo/Lab/resources/left_arrow.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/left_arrow.png rename to Lab/demo/Lab/resources/left_arrow.png diff --git a/Polyhedron/demo/Polyhedron/resources/menu.png b/Lab/demo/Lab/resources/menu.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/menu.png rename to Lab/demo/Lab/resources/menu.png diff --git a/Polyhedron/demo/Polyhedron/resources/minus.png b/Lab/demo/Lab/resources/minus.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/minus.png rename to Lab/demo/Lab/resources/minus.png diff --git a/Polyhedron/demo/Polyhedron/resources/no_interpolation_shader.frag b/Lab/demo/Lab/resources/no_interpolation_shader.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/no_interpolation_shader.frag rename to Lab/demo/Lab/resources/no_interpolation_shader.frag diff --git a/Polyhedron/demo/Polyhedron/resources/no_interpolation_shader.geom b/Lab/demo/Lab/resources/no_interpolation_shader.geom similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/no_interpolation_shader.geom rename to Lab/demo/Lab/resources/no_interpolation_shader.geom diff --git a/Polyhedron/demo/Polyhedron/resources/no_interpolation_shader.vert b/Lab/demo/Lab/resources/no_interpolation_shader.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/no_interpolation_shader.vert rename to Lab/demo/Lab/resources/no_interpolation_shader.vert diff --git a/Polyhedron/demo/Polyhedron/resources/pause.jpeg b/Lab/demo/Lab/resources/pause.jpeg similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pause.jpeg rename to Lab/demo/Lab/resources/pause.jpeg diff --git a/Polyhedron/demo/Polyhedron/resources/play.jpeg b/Lab/demo/Lab/resources/play.jpeg similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/play.jpeg rename to Lab/demo/Lab/resources/play.jpeg diff --git a/Polyhedron/demo/Polyhedron/resources/plus.png b/Lab/demo/Lab/resources/plus.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/plus.png rename to Lab/demo/Lab/resources/plus.png diff --git a/Polyhedron/demo/Polyhedron/resources/prism-open.png b/Lab/demo/Lab/resources/prism-open.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/prism-open.png rename to Lab/demo/Lab/resources/prism-open.png diff --git a/Polyhedron/demo/Polyhedron/resources/prism.png b/Lab/demo/Lab/resources/prism.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/prism.png rename to Lab/demo/Lab/resources/prism.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_box.png b/Lab/demo/Lab/resources/pss_box.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_box.png rename to Lab/demo/Lab/resources/pss_box.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_diff.png b/Lab/demo/Lab/resources/pss_diff.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_diff.png rename to Lab/demo/Lab/resources/pss_diff.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_freeform.png b/Lab/demo/Lab/resources/pss_freeform.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_freeform.png rename to Lab/demo/Lab/resources/pss_freeform.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_inter.png b/Lab/demo/Lab/resources/pss_inter.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_inter.png rename to Lab/demo/Lab/resources/pss_inter.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_new.png b/Lab/demo/Lab/resources/pss_new.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_new.png rename to Lab/demo/Lab/resources/pss_new.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_rectangle.png b/Lab/demo/Lab/resources/pss_rectangle.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_rectangle.png rename to Lab/demo/Lab/resources/pss_rectangle.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_region.png b/Lab/demo/Lab/resources/pss_region.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_region.png rename to Lab/demo/Lab/resources/pss_region.png diff --git a/Polyhedron/demo/Polyhedron/resources/pss_union.png b/Lab/demo/Lab/resources/pss_union.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pss_union.png rename to Lab/demo/Lab/resources/pss_union.png diff --git a/Polyhedron/demo/Polyhedron/resources/pyramid-open.png b/Lab/demo/Lab/resources/pyramid-open.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pyramid-open.png rename to Lab/demo/Lab/resources/pyramid-open.png diff --git a/Polyhedron/demo/Polyhedron/resources/pyramid.png b/Lab/demo/Lab/resources/pyramid.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/pyramid.png rename to Lab/demo/Lab/resources/pyramid.png diff --git a/Polyhedron/demo/Polyhedron/resources/reset.jpg b/Lab/demo/Lab/resources/reset.jpg similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/reset.jpg rename to Lab/demo/Lab/resources/reset.jpg diff --git a/Polyhedron/demo/Polyhedron/resources/right.png b/Lab/demo/Lab/resources/right.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/right.png rename to Lab/demo/Lab/resources/right.png diff --git a/Polyhedron/demo/Polyhedron/resources/right_arrow.png b/Lab/demo/Lab/resources/right_arrow.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/right_arrow.png rename to Lab/demo/Lab/resources/right_arrow.png diff --git a/Polyhedron/demo/Polyhedron/resources/rotate_around_cursor.png b/Lab/demo/Lab/resources/rotate_around_cursor.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/rotate_around_cursor.png rename to Lab/demo/Lab/resources/rotate_around_cursor.png diff --git a/Polyhedron/demo/Polyhedron/resources/shader_c3t3.frag b/Lab/demo/Lab/resources/shader_c3t3.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_c3t3.frag rename to Lab/demo/Lab/resources/shader_c3t3.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_c3t3.vert b/Lab/demo/Lab/resources/shader_c3t3.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_c3t3.vert rename to Lab/demo/Lab/resources/shader_c3t3.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_c3t3_edges.frag b/Lab/demo/Lab/resources/shader_c3t3_edges.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_c3t3_edges.frag rename to Lab/demo/Lab/resources/shader_c3t3_edges.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_c3t3_edges.vert b/Lab/demo/Lab/resources/shader_c3t3_edges.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_c3t3_edges.vert rename to Lab/demo/Lab/resources/shader_c3t3_edges.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_c3t3_spheres.frag b/Lab/demo/Lab/resources/shader_c3t3_spheres.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_c3t3_spheres.frag rename to Lab/demo/Lab/resources/shader_c3t3_spheres.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_c3t3_spheres.vert b/Lab/demo/Lab/resources/shader_c3t3_spheres.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_c3t3_spheres.vert rename to Lab/demo/Lab/resources/shader_c3t3_spheres.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_dark_spheres.vert b/Lab/demo/Lab/resources/shader_dark_spheres.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_dark_spheres.vert rename to Lab/demo/Lab/resources/shader_dark_spheres.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_flat.frag b/Lab/demo/Lab/resources/shader_flat.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_flat.frag rename to Lab/demo/Lab/resources/shader_flat.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_flat.geom b/Lab/demo/Lab/resources/shader_flat.geom similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_flat.geom rename to Lab/demo/Lab/resources/shader_flat.geom diff --git a/Polyhedron/demo/Polyhedron/resources/shader_flat.vert b/Lab/demo/Lab/resources/shader_flat.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_flat.vert rename to Lab/demo/Lab/resources/shader_flat.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_instanced.vert b/Lab/demo/Lab/resources/shader_instanced.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_instanced.vert rename to Lab/demo/Lab/resources/shader_instanced.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_no_light_no_selection.frag b/Lab/demo/Lab/resources/shader_no_light_no_selection.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_no_light_no_selection.frag rename to Lab/demo/Lab/resources/shader_no_light_no_selection.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_old_flat.frag b/Lab/demo/Lab/resources/shader_old_flat.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_old_flat.frag rename to Lab/demo/Lab/resources/shader_old_flat.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_plane_two_faces.frag b/Lab/demo/Lab/resources/shader_plane_two_faces.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_plane_two_faces.frag rename to Lab/demo/Lab/resources/shader_plane_two_faces.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_spheres.vert b/Lab/demo/Lab/resources/shader_spheres.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_spheres.vert rename to Lab/demo/Lab/resources/shader_spheres.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_tet_filter.frag b/Lab/demo/Lab/resources/shader_tet_filter.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_tet_filter.frag rename to Lab/demo/Lab/resources/shader_tet_filter.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_tet_filter.vert b/Lab/demo/Lab/resources/shader_tet_filter.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_tet_filter.vert rename to Lab/demo/Lab/resources/shader_tet_filter.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_light.frag b/Lab/demo/Lab/resources/shader_with_light.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_with_light.frag rename to Lab/demo/Lab/resources/shader_with_light.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_light.vert b/Lab/demo/Lab/resources/shader_with_light.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_with_light.vert rename to Lab/demo/Lab/resources/shader_with_light.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_texture.frag b/Lab/demo/Lab/resources/shader_with_texture.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_with_texture.frag rename to Lab/demo/Lab/resources/shader_with_texture.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_texture.vert b/Lab/demo/Lab/resources/shader_with_texture.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_with_texture.vert rename to Lab/demo/Lab/resources/shader_with_texture.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_textured_edges.frag b/Lab/demo/Lab/resources/shader_with_textured_edges.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_with_textured_edges.frag rename to Lab/demo/Lab/resources/shader_with_textured_edges.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_with_textured_edges.vert b/Lab/demo/Lab/resources/shader_with_textured_edges.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_with_textured_edges.vert rename to Lab/demo/Lab/resources/shader_with_textured_edges.vert diff --git a/Polyhedron/demo/Polyhedron/resources/shader_without_light.frag b/Lab/demo/Lab/resources/shader_without_light.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_without_light.frag rename to Lab/demo/Lab/resources/shader_without_light.frag diff --git a/Polyhedron/demo/Polyhedron/resources/shader_without_light.vert b/Lab/demo/Lab/resources/shader_without_light.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/shader_without_light.vert rename to Lab/demo/Lab/resources/shader_without_light.vert diff --git a/Polyhedron/demo/Polyhedron/resources/simplification.png b/Lab/demo/Lab/resources/simplification.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/simplification.png rename to Lab/demo/Lab/resources/simplification.png diff --git a/Polyhedron/demo/Polyhedron/resources/solid_wireframe_shader.frag b/Lab/demo/Lab/resources/solid_wireframe_shader.frag similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/solid_wireframe_shader.frag rename to Lab/demo/Lab/resources/solid_wireframe_shader.frag diff --git a/Polyhedron/demo/Polyhedron/resources/solid_wireframe_shader.geom b/Lab/demo/Lab/resources/solid_wireframe_shader.geom similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/solid_wireframe_shader.geom rename to Lab/demo/Lab/resources/solid_wireframe_shader.geom diff --git a/Polyhedron/demo/Polyhedron/resources/solid_wireframe_shader.vert b/Lab/demo/Lab/resources/solid_wireframe_shader.vert similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/solid_wireframe_shader.vert rename to Lab/demo/Lab/resources/solid_wireframe_shader.vert diff --git a/Polyhedron/demo/Polyhedron/resources/tetrahedron.png b/Lab/demo/Lab/resources/tetrahedron.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/tetrahedron.png rename to Lab/demo/Lab/resources/tetrahedron.png diff --git a/Polyhedron/demo/Polyhedron/resources/top.png b/Lab/demo/Lab/resources/top.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/top.png rename to Lab/demo/Lab/resources/top.png diff --git a/Polyhedron/demo/Polyhedron/resources/up.png b/Lab/demo/Lab/resources/up.png similarity index 100% rename from Polyhedron/demo/Polyhedron/resources/up.png rename to Lab/demo/Lab/resources/up.png diff --git a/Polyhedron/demo/Polyhedron/testing/data/camera.camera.txt b/Lab/demo/Lab/testing/data/camera.camera.txt similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/camera.camera.txt rename to Lab/demo/Lab/testing/data/camera.camera.txt diff --git a/Polyhedron/demo/Polyhedron/testing/data/mini.surf b/Lab/demo/Lab/testing/data/mini.surf similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/mini.surf rename to Lab/demo/Lab/testing/data/mini.surf diff --git a/Polyhedron/demo/Polyhedron/testing/data/oni.las b/Lab/demo/Lab/testing/data/oni.las similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/oni.las rename to Lab/demo/Lab/testing/data/oni.las diff --git a/Polyhedron/demo/Polyhedron/testing/data/poly.polylines.txt b/Lab/demo/Lab/testing/data/poly.polylines.txt similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/poly.polylines.txt rename to Lab/demo/Lab/testing/data/poly.polylines.txt diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.inr b/Lab/demo/Lab/testing/data/sphere.inr similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.inr rename to Lab/demo/Lab/testing/data/sphere.inr diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.inr.gz b/Lab/demo/Lab/testing/data/sphere.inr.gz similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.inr.gz rename to Lab/demo/Lab/testing/data/sphere.inr.gz diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.mesh b/Lab/demo/Lab/testing/data/sphere.mesh similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.mesh rename to Lab/demo/Lab/testing/data/sphere.mesh diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.nef3 b/Lab/demo/Lab/testing/data/sphere.nef3 similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.nef3 rename to Lab/demo/Lab/testing/data/sphere.nef3 diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.selection.txt b/Lab/demo/Lab/testing/data/sphere.selection.txt similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.selection.txt rename to Lab/demo/Lab/testing/data/sphere.selection.txt diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.ts b/Lab/demo/Lab/testing/data/sphere.ts similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.ts rename to Lab/demo/Lab/testing/data/sphere.ts diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.vtk b/Lab/demo/Lab/testing/data/sphere.vtk similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.vtk rename to Lab/demo/Lab/testing/data/sphere.vtk diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.vtp b/Lab/demo/Lab/testing/data/sphere.vtp similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.vtp rename to Lab/demo/Lab/testing/data/sphere.vtp diff --git a/Polyhedron/demo/Polyhedron/testing/data/sphere.vtu b/Lab/demo/Lab/testing/data/sphere.vtu similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/data/sphere.vtu rename to Lab/demo/Lab/testing/data/sphere.vtu diff --git a/Polyhedron/demo/Polyhedron/testing/test_demo.js b/Lab/demo/Lab/testing/test_demo.js similarity index 100% rename from Polyhedron/demo/Polyhedron/testing/test_demo.js rename to Lab/demo/Lab/testing/test_demo.js diff --git a/Polyhedron/demo/Polyhedron/texture.cpp b/Lab/demo/Lab/texture.cpp similarity index 100% rename from Polyhedron/demo/Polyhedron/texture.cpp rename to Lab/demo/Lab/texture.cpp diff --git a/Polyhedron/demo/Polyhedron/texture.h b/Lab/demo/Lab/texture.h similarity index 100% rename from Polyhedron/demo/Polyhedron/texture.h rename to Lab/demo/Lab/texture.h diff --git a/Polyhedron/demo/Polyhedron/triangulate_primitive.h b/Lab/demo/Lab/triangulate_primitive.h similarity index 100% rename from Polyhedron/demo/Polyhedron/triangulate_primitive.h rename to Lab/demo/Lab/triangulate_primitive.h diff --git a/Lab/package_info/Lab/copyright b/Lab/package_info/Lab/copyright new file mode 100644 index 000000000000..82b520cf64cb --- /dev/null +++ b/Lab/package_info/Lab/copyright @@ -0,0 +1 @@ +GeometryFactory \ No newline at end of file diff --git a/Lab/package_info/Lab/dependencies b/Lab/package_info/Lab/dependencies new file mode 100644 index 000000000000..76331fefe0d7 --- /dev/null +++ b/Lab/package_info/Lab/dependencies @@ -0,0 +1,2 @@ +Installation +STL_Extension diff --git a/Lab/package_info/Lab/description.txt b/Lab/package_info/Lab/description.txt new file mode 100644 index 000000000000..58071f8283e9 --- /dev/null +++ b/Lab/package_info/Lab/description.txt @@ -0,0 +1 @@ +Application running 3D algorithms on 3D items. \ No newline at end of file diff --git a/Lab/package_info/Lab/license.txt b/Lab/package_info/Lab/license.txt new file mode 100644 index 000000000000..8bb8efcb72b0 --- /dev/null +++ b/Lab/package_info/Lab/license.txt @@ -0,0 +1 @@ +GPL (v3 or later) diff --git a/Lab/package_info/Lab/long_description.txt b/Lab/package_info/Lab/long_description.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/Lab/package_info/Lab/maintainer b/Lab/package_info/Lab/maintainer new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/Polyhedron/demo/Polyhedron/CGAL_polyhedron_demoConfig.cmake.in b/Polyhedron/demo/Polyhedron/CGAL_polyhedron_demoConfig.cmake.in deleted file mode 100644 index d8e41b04f9ce..000000000000 --- a/Polyhedron/demo/Polyhedron/CGAL_polyhedron_demoConfig.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ -set(CGAL_POLYHEDRON_DEMO_CMAKE_MODULE_PATH "@CMAKE_CURRENT_SOURCE_DIR@;@CMAKE_CURRENT_BINARY_DIR@") -set(CGAL_POLYHEDRON_DEMO_DEFINITIONS "@CGAL_POLYHEDRON_DEMO_DEFINITIONS@") -set(CGAL_POLYHEDRON_DEMO_HEADERS_DIRS "@CMAKE_CURRENT_SOURCE_DIR@;@CMAKE_CURRENT_SOURCE_DIR@/include;@CMAKE_CURRENT_SOURCE_DIR@/CGAL_demo") -set(CGAL_POLYHEDRON_DEMO_DIR "@CMAKE_CURRENT_BINARY_DIR@") -set(CGAL_POLYHEDRON_DEMO_PLUGINS_DIR "@CGAL_POLYHEDRON_DEMO_PLUGINS_DIR@") -set(CGAL_POLYHEDRON_DEMO_USE_FILE "@CMAKE_CURRENT_SOURCE_DIR@/UseCGAL_polyhedron_demo.cmake") -set(CGAL_polyhedron_demoFOUND TRUE) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/CMakeLists.txt deleted file mode 100644 index 338b6cfb52b2..000000000000 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -include(polyhedron_demo_macros) - -polyhedron_demo_plugin(nef_plugin Nef_plugin) -target_link_libraries(nef_plugin PUBLIC scene_nef_polyhedron_item) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/CMakeLists.txt deleted file mode 100644 index ff1ff484cdeb..000000000000 --- a/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -include(polyhedron_demo_macros) - -polyhedron_demo_plugin(subdivision_methods_plugin Subdivision_methods_plugin) -target_link_libraries(subdivision_methods_plugin PUBLIC scene_surface_mesh_item) diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_config.h b/Polyhedron/demo/Polyhedron/Polyhedron_demo_config.h deleted file mode 100644 index 08a7d4eaf43d..000000000000 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_config.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef POLYHEDRON_DEMO_CONFIG_H -#define POLYHEDRON_DEMO_CONFIG_H - -#ifdef polyhedron_demo_EXPORTS -# define POLYHEDRON_DEMO_EXPORT Q_DECL_EXPORT -#else -# define POLYHEDRON_DEMO_EXPORT Q_DECL_IMPORT -#endif - -#endif // POLYHEDRON_DEMO_CONFIG_H diff --git a/Polyhedron/demo/Polyhedron/UseCGAL_polyhedron_demo.cmake b/Polyhedron/demo/Polyhedron/UseCGAL_polyhedron_demo.cmake deleted file mode 100644 index db009e36f33f..000000000000 --- a/Polyhedron/demo/Polyhedron/UseCGAL_polyhedron_demo.cmake +++ /dev/null @@ -1,12 +0,0 @@ -message(STATUS "Using CGAL_polyhedron_demo from: ${CGAL_POLYHEDRON_DEMO_DIR}") - -list(INSERT CMAKE_MODULE_PATH 0 "${CGAL_POLYHEDRON_DEMO_CMAKE_MODULE_PATH}") - -message(STATUS "Now CMAKE_MODULE_PATH is: ${CMAKE_MODULE_PATH}") - -include( polyhedron_demo_macros ) -include( polyhedron_demo_targets ) - - -include_directories( ${CGAL_POLYHEDRON_DEMO_HEADERS_DIRS} ) -add_definitions(${CGAL_POLYHEDRON_DEMO_DEFINITIONS}) diff --git a/Polyhedron/demo/Polyhedron/config.h b/Polyhedron/demo/Polyhedron/config.h deleted file mode 100644 index c36e7e5e1ae5..000000000000 --- a/Polyhedron/demo/Polyhedron/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// #define CGAL_POLYHEDRON_DEMO_NO_NEF -// #define CGAL_POLYHEDRON_DEMO_NO_SURFACE_MESHER -// #define CGAL_POLYHEDRON_DEMO_NO_PARAMETRIZATION - -#ifndef CGAL_POLYHEDRON_DEMO_CONFIG_H -#define CGAL_POLYHEDRON_DEMO_CONFIG_H - -#ifdef CGAL_USE_SSH -//to avoid clashing between windows.h and winsock2.h -#define _WINSOCKAPI_ -#endif - -#ifndef CGAL_POLYHEDRON_DEMO_NO_PARAMETRIZATION -# define CGAL_POLYHEDRON_DEMO_USE_PARAMETRIZATION -#endif - -#ifndef CGAL_POLYHEDRON_DEMO_NO_NEF -# define CGAL_POLYHEDRON_DEMO_USE_NEF -#endif - -#ifndef CGAL_POLYHEDRON_DEMO_NO_SURFACE_MESHER -# define CGAL_POLYHEDRON_DEMO_USE_SURFACE_MESHER -#endif - -#endif // CGAL_POLYHEDRON_DEMO_CONFIG_H diff --git a/Three/doc/Three/Doxyfile.in b/Three/doc/Three/Doxyfile.in index 60caa240a41a..ceb1270502ed 100644 --- a/Three/doc/Three/Doxyfile.in +++ b/Three/doc/Three/Doxyfile.in @@ -1,9 +1,9 @@ @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS} PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Three" -INPUT += ${CGAL_Polyhedron_DEMO_DIR}/Polyhedron/Scene.h \ - ${CGAL_Polyhedron_DEMO_DIR}/Polyhedron/Polyhedron_demo.h \ +INPUT += ${CGAL_Lab_DEMO_DIR}/Lab/Scene.h \ + ${CGAL_Lab_DEMO_DIR}/Lab/cgallab.h \ -EXAMPLE_PATH = ${CGAL_Polyhedron_DEMO_DIR}/Polyhedron/Plugins/ +EXAMPLE_PATH = ${CGAL_Lab_DEMO_DIR}/Lab/Plugins/ IMAGE_PATH = ${CGAL_PACKAGE_DIR}/doc/Three/fig/ EXTRACT_ALL = false diff --git a/Three/doc/Three/PackageDescription.txt b/Three/doc/Three/PackageDescription.txt index f04d3ec8473c..067d3fa37632 100644 --- a/Three/doc/Three/PackageDescription.txt +++ b/Three/doc/Three/PackageDescription.txt @@ -20,8 +20,8 @@ \cgalCRPSection{Interfaces} - `CGAL::Three::Viewer_interface` - `CGAL::Three::Scene_interface` -- `CGAL::Three::Polyhedron_demo_plugin_interface` -- `CGAL::Three::Polyhedron_demo_io_plugin_interface` +- `CGAL::Three::CGAL_Lab_plugin_interface` +- `CGAL::Three::CGAL_Lab_io_plugin_interface` \cgalCRPSection{Classes} - `TextRenderer` diff --git a/Three/doc/Three/Three.txt b/Three/doc/Three/Three.txt index 2afe5f4d27ca..ba0cc0946aab 100644 --- a/Three/doc/Three/Three.txt +++ b/Three/doc/Three/Three.txt @@ -6,8 +6,8 @@ namespace CGAL { \cgalAutoToc \author Laurent Rineau, Sebastien Loriot, Andreas Fabri, Maxime Gimeno -This package regroups the files making the API for creating and adding a new plugin to the Polyhedron_demo. \n -\section intro Understanding the Polyhedron Demo +This package regroups the files making the API for creating and adding a new plugin to the CGAL_Lab. \n +\section intro Understanding the Lab There are several levels in this demo. @@ -24,22 +24,22 @@ A plugin usually make use of objects that inherit from `CGAL::Three::Scene_item` \subsection examplePluginItself The Plugin Itself -A basic plugin will inherit from `CGAL::Three::Polyhedron_demo_plugin_interface`. +A basic plugin will inherit from `CGAL::Three::CGAL_Lab_plugin_interface`. It must be created in the corresponding folder named after its package, and containing all the files created for the plugin, and a CMakeLists.txt file. Its name must be of the form Xxxx_yyyy_plugin. \n - [init()]: @ref CGAL::Three::Polyhedron_demo_plugin_interface#init(QMainWindow*,CGAL::Three::Scene_interface*,Messages_interface*) - [applicable()]: @ref CGAL::Three::Polyhedron_demo_plugin_interface#applicable() - [actions()]: @ref CGAL::Three::Polyhedron_demo_plugin_interface#actions() + [init()]: @ref CGAL::Three::CGAL_Lab_plugin_interface#init(QMainWindow*,CGAL::Three::Scene_interface*,Messages_interface*) + [applicable()]: @ref CGAL::Three::CGAL_Lab_plugin_interface#applicable() + [actions()]: @ref CGAL::Three::CGAL_Lab_plugin_interface#actions() The class must contain the following lines :\n ~~~~~~~~~~~~~{.cpp} Q_OBJECT - Q_INTERFACES(CGAL::Three::Polyhedron_demo_plugin_interface) - Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") + Q_INTERFACES(CGAL::Three::CGAL_Lab_plugin_interface) + Q_PLUGIN_METADATA(IID "com.geometryfactory.CGALLab.PluginInterface/1.0") ~~~~~~~~~~~~~ -Your plugin must override the three pure virtual functions inherited from Polyhedron_demo_plugin_interface : \n +Your plugin must override the three pure virtual functions inherited from CGAL_Lab_plugin_interface : \n - [actions()] that will hold the actions of the plugin - [applicable()] that will decide if the plugin can be used with the current selection of items - [init()] that will declare and link the actions of the plugin @@ -64,8 +64,8 @@ If you created your plugin in an existing directory, the CMakeLists.txt file alr The CMakeLists.txt file : - include( polyhedron_demo_macros ) - polyhedron_demo_plugin(basic_plugin Basic_plugin) + include( cgal_lab_macros ) + cgal_lab_plugin(basic_plugin Basic_plugin) \subsection basicPluginDialog Adding a Dialog to Your Plugin @@ -85,7 +85,7 @@ Then select among the template/form choices. Name it Xxxx_yyyy_dialog.ui (you may have to rename it once it is created as QtCreator tends to forget the capital letters), and add it to the project in the CMakeLists : qt6_wrap_ui( basicUI_FILES Basic_dialog.ui ) - polyhedron_demo_plugin(basic_plugin Basic_plugin ${basicUI_FILES}) + cgal_lab_plugin(basic_plugin Basic_plugin ${basicUI_FILES}) Add a layout to the dialog with a drag and drop and lay it out. * \image html menu_4.png @@ -115,14 +115,14 @@ It is really simple to add a pop-up box with Qt. Use a QMessageBox and give it s \subsection examplePluginDockWidget Adding a Dock Widget This section describes how to add a dock widget to the application.\n -You can make your plugin inherit from CGAL::Three::Polyhedron_demo_plugin_helper, which gives access to the function CGAL::Three::Polyhedron_demo_plugin_helper#addDockWidget. +You can make your plugin inherit from CGAL::Three::CGAL_Lab_plugin_helper, which gives access to the function CGAL::Three::CGAL_Lab_plugin_helper#addDockWidget. This will manage automatically the position and tabification of a dock widget. \n Just like with the Dialog, create a new Qt Designer form (file->New file or Project->Qt->Qt Designer Form), choose `QDockWidget` in Widgets * \image html menu_6.png Add it to the project in the CMakeLists.txt : qt6_wrap_ui( dockUI_FILES Basic_dock_widget.ui ) - polyhedron_demo_plugin(dock_widget_plugin Dock_widget_plugin ${dockUI_FILES}) + cgal_lab_plugin(dock_widget_plugin Dock_widget_plugin ${dockUI_FILES}) Edit the ui file with the editor, then add the following line to your plugin file: ~~~~~~~~~~~~~{.cpp} @@ -197,7 +197,7 @@ Simply create a new instance of the item you want and call the function CGAL::Th Once your code is written, you will need to link the item's library to your plugin thanks to the CMakeLists, using the command target_link_library : - polyhedron_demo_plugin(basic_item_plugin Basic_item_plugin) + cgal_lab_plugin(basic_item_plugin Basic_item_plugin) # links the library containing the scene_plane_item with the plugin target_link_libraries(basic_item_plugin PUBLIC scene_basic_objects) @@ -249,7 +249,7 @@ All the initialization and containers handling happen in the drawing function, b We start by checking all the switches and call the right initialization functions accordingly. After that, we can set the uniform values and actually draw the content of the containers.\n -If you created your item in a specific file and you need to use it outside your plugin (like in another plugin), it is recommended to put it in the demo's root directory, and you will have to define your item in the general Polyhedron_demo's CMakeLists.txt by using the macro add_item : +If you created your item in a specific file and you need to use it outside your plugin (like in another plugin), it is recommended to put it in the demo's root directory, and you will have to define your item in the general CGAL_Lab's CMakeLists.txt by using the macro add_item : add_item(scene_trivial_item Scene_trivial_item.cpp) target_link_libraries(scene_trivial_item PUBLIC scene_dependances_item) @@ -275,20 +275,20 @@ You also have the possibility to "lock" a child of a group with `CGAL::Three::Sc \section exampleIOPlugin Creating an I/O Plugin An I/O plugin is a plugin desined to load from and save to a certain type of file. Its name is generally of the form Xxxx_yyyy_io_plugin \n -It inherits from the CGAL::Three::Polyhedron_demo_io_plugin_interface. It must implement the following functions : -- CGAL::Three::Polyhedron_demo_io_plugin_interface#name which returns the plugin's name. +It inherits from the CGAL::Three::CGAL_Lab_io_plugin_interface. It must implement the following functions : +- CGAL::Three::CGAL_Lab_io_plugin_interface#name which returns the plugin's name. ~~~~~~~~~~~~~{.cpp} QString name() const { return "Xxxx_yyyy_io_plugin"; } ~~~~~~~~~~~~~ -- CGAL::Three::Polyhedron_demo_io_plugin_interface#nameFilters which returns a list of extensions of the files the plugin can read : +- CGAL::Three::CGAL_Lab_io_plugin_interface#nameFilters which returns a list of extensions of the files the plugin can read : ~~~~~~~~~~~~~{.cpp} QString nameFilters() const { return "Text files (*.txt)"; } ~~~~~~~~~~~~~ -- CGAL::Three::Polyhedron_demo_io_plugin_interface#canLoad which returns true if the plugin is able to load : +- CGAL::Three::CGAL_Lab_io_plugin_interface#canLoad which returns true if the plugin is able to load : ~~~~~~~~~~~~~{.cpp} bool canLoad() const { return true; } ~~~~~~~~~~~~~ -- CGAL::Three::Polyhedron_demo_io_plugin_interface#load : which fills the data of an object from a file : +- CGAL::Three::CGAL_Lab_io_plugin_interface#load : which fills the data of an object from a file : ~~~~~~~~~~~~~{.cpp} CGAL::Three::Scene_item* load(QFileInfo fileinfo) { if(fileinfo.suffix().toLower() != "txt") return 0; @@ -300,13 +300,13 @@ CGAL::Three::Scene_item* load(QFileInfo fileinfo) { return item; } ~~~~~~~~~~~~~ -- CGAL::Three::Polyhedron_demo_io_plugin_interface#canSave which returns true if the plugin is able to save : +- CGAL::Three::CGAL_Lab_io_plugin_interface#canSave which returns true if the plugin is able to save : ~~~~~~~~~~~~~{.cpp} bool canSave(const CGAL::Three::Scene_item* scene_item) { return qobject_cast(scene_item); } ~~~~~~~~~~~~~ -- CGAL::Three::Polyhedron_demo_io_plugin_interface#save which fills a file with the data of an item +- CGAL::Three::CGAL_Lab_io_plugin_interface#save which fills a file with the data of an item ~~~~~~~~~~~~~{.cpp} bool save(const CGAL::Three::Scene_item* scene_item, QFileInfo fileinfo) { const Scene_trivial_item* item = qobject_cast(scene_item); @@ -338,24 +338,24 @@ Configure CMake as you desire and fetch the right Qt6 packages : COMPONENTS OpenGLWidgets Svg OPTIONAL_COMPONENTS WebSockets) -You will probably have to fetch the libraries exported by the Polyhedron_demo, like the Scene_items. +You will probably have to fetch the libraries exported by the CGAL_Lab, like the Scene_items. - find_package(CGAL_polyhedron_demo - HINTS "${CGAL_DIR}" "${CGAL_DIR}/Polyhedron/demo/Polyhedron-build" + find_package(CGAL_cgal_lab + HINTS "${CGAL_DIR}" "${CGAL_DIR}/Lab/demo/Lab-build" ) - include( ${CGAL_POLYHEDRON_DEMO_USE_FILE} ) + include( ${CGAL_LAB_DEMO_USE_FILE} ) -Be careful, the polyhedron_demo build directory must contain a build of the demo that comes from the same CGAL version than the one of your CGAL_DIR. +Be careful, the cgal_lab build directory must contain a build of the demo that comes from the same CGAL version than the one of your CGAL_DIR. Finally, you can declare your plugin - polyhedron_demo_plugin(example_plugin Example_plugin) + cgal_lab_plugin(example_plugin Example_plugin) -If you need targets from the Polyhedron_demo, you will have to add the prefix 'Polyhedron_' to the target's name, as the exported targets belong to the namespace Polyhedron_ +If you need targets from the CGAL_Lab, you will have to add the prefix 'Lab_' to the target's name, as the exported targets belong to the namespace Lab_ - polyhedron_demo_plugin(basic_item_plugin Basic_item_plugin) - target_link_libraries(basic_item_plugin PUBLIC Polyhedron_scene_basic_objects) + cgal_lab_plugin(basic_item_plugin Basic_item_plugin) + target_link_libraries(basic_item_plugin PUBLIC Lab_scene_basic_objects) -Notice that an external plugin will not be automatically loaded in the Polyhedron demo. It must be built in its own project. +Notice that an external plugin will not be automatically loaded in the Lab. It must be built in its own project. Complete CMakeLists : @@ -376,14 +376,14 @@ Notice that an external plugin will not be automatically loaded in the Polyhedro OPTIONAL_COMPONENTS WebSockets) if(Qt6_FOUND AND CGAL_FOUND) - find_package(CGAL_polyhedron_demo) + find_package(CGAL_cgal_lab) - include( ${CGAL_POLYHEDRON_DEMO_USE_FILE} ) + include( ${CGAL_LAB_DEMO_USE_FILE} ) # Let plugins be compiled in the same directory as the executable. set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") - polyhedron_demo_plugin(example_plugin Example_plugin) + cgal_lab_plugin(example_plugin Example_plugin) endif() diff --git a/Three/doc/Three/dependencies b/Three/doc/Three/dependencies index a01021f28b7a..5860fb8c5161 100644 --- a/Three/doc/Three/dependencies +++ b/Three/doc/Three/dependencies @@ -4,4 +4,4 @@ STL_Extension Algebraic_foundations Circulator Stream_support -Polyhedron +Lab diff --git a/Three/include/CGAL/Three/Polyhedron_demo_io_plugin_interface.h b/Three/include/CGAL/Three/CGAL_Lab_io_plugin_interface.h similarity index 88% rename from Three/include/CGAL/Three/Polyhedron_demo_io_plugin_interface.h rename to Three/include/CGAL/Three/CGAL_Lab_io_plugin_interface.h index 7ab42e87c815..bfad4ad6206a 100644 --- a/Three/include/CGAL/Three/Polyhedron_demo_io_plugin_interface.h +++ b/Three/include/CGAL/Three/CGAL_Lab_io_plugin_interface.h @@ -9,9 +9,9 @@ // // // Author(s) : Laurent RINEAU -//! \file Polyhedron_demo_io_plugin_interface.h -#ifndef POLYHEDRON_DEMO_IO_PLUGIN_INTERFACE_H -#define POLYHEDRON_DEMO_IO_PLUGIN_INTERFACE_H +//! \file CGAL_Lab_io_plugin_interface.h +#ifndef LAB_DEMO_IO_PLUGIN_INTERFACE_H +#define LAB_DEMO_IO_PLUGIN_INTERFACE_H #include @@ -28,7 +28,7 @@ class Scene_interface; /*! * This class provides a base for creating a new IO plugin. */ -class Polyhedron_demo_io_plugin_interface +class CGAL_Lab_io_plugin_interface { public: //! \brief initializes the plugin @@ -39,7 +39,7 @@ class Polyhedron_demo_io_plugin_interface //!Returns the name of the plugin //!It is used by the loading system. virtual QString name() const = 0; - virtual ~Polyhedron_demo_io_plugin_interface() {} + virtual ~CGAL_Lab_io_plugin_interface() {} /*! The filters for the names of the files that can be used * by the plugin. * Example : to filter OFF files : return "OFF files (*.off)" @@ -86,7 +86,7 @@ class Polyhedron_demo_io_plugin_interface }; } } -Q_DECLARE_INTERFACE(CGAL::Three::Polyhedron_demo_io_plugin_interface, - "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.90") +Q_DECLARE_INTERFACE(CGAL::Three::CGAL_Lab_io_plugin_interface, + "com.geometryfactory.CGALLab.IOPluginInterface/1.90") -#endif // POLYHEDRON_DEMO_IO_PLUGIN_INTERFACE_H +#endif // LAB_DEMO_IO_PLUGIN_INTERFACE_H diff --git a/Three/include/CGAL/Three/Polyhedron_demo_plugin_helper.h b/Three/include/CGAL/Three/CGAL_Lab_plugin_helper.h similarity index 88% rename from Three/include/CGAL/Three/Polyhedron_demo_plugin_helper.h rename to Three/include/CGAL/Three/CGAL_Lab_plugin_helper.h index dd04a031e812..7c5f99e3f50f 100644 --- a/Three/include/CGAL/Three/Polyhedron_demo_plugin_helper.h +++ b/Three/include/CGAL/Three/CGAL_Lab_plugin_helper.h @@ -10,9 +10,9 @@ // // Author(s) : Laurent RINEAU -//! \file Polyhedron_demo_plugin_helper.h -#ifndef POLYHEDRON_DEMO_OPERATION_HELPER_H -#define POLYHEDRON_DEMO_OPERATION_HELPER_H +//! \file CGAL_Lab_plugin_helper.h +#ifndef LAB_DEMO_OPERATION_HELPER_H +#define LAB_DEMO_OPERATION_HELPER_H #include @@ -28,7 +28,7 @@ struct QMetaObject; class QMainWindow; class QDockWidget; -#include +#include #include namespace CGAL { namespace Three { @@ -36,8 +36,8 @@ namespace Three { * This class provides convenient functions to manage dock_widgets and to access a certain type of items in the scene. * It also provides member variables for a Scene_interface and a QMainWindow. */ -class SCENE_ITEM_EXPORT Polyhedron_demo_plugin_helper - : public Polyhedron_demo_plugin_interface +class SCENE_ITEM_EXPORT CGAL_Lab_plugin_helper + : public CGAL_Lab_plugin_interface { public: @@ -86,4 +86,4 @@ class SCENE_ITEM_EXPORT Polyhedron_demo_plugin_helper }; } } -#endif // POLYHEDRON_DEMO_OPERATION_HELPER_H +#endif // LAB_DEMO_OPERATION_HELPER_H diff --git a/Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h b/Three/include/CGAL/Three/CGAL_Lab_plugin_interface.h similarity index 81% rename from Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h rename to Three/include/CGAL/Three/CGAL_Lab_plugin_interface.h index c0478ae29a8d..0ed985acb0a4 100644 --- a/Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h +++ b/Three/include/CGAL/Three/CGAL_Lab_plugin_interface.h @@ -10,9 +10,9 @@ // // Author(s) : Laurent RINEAU -//! \file Polyhedron_demo_plugin_interface.h -#ifndef POLYHEDRON_DEMO_PLUGIN_INTERFACE_H -#define POLYHEDRON_DEMO_PLUGIN_INTERFACE_H +//! \file CGAL_Lab_plugin_interface.h +#ifndef LAB_DEMO_PLUGIN_INTERFACE_H +#define LAB_DEMO_PLUGIN_INTERFACE_H #include @@ -31,7 +31,7 @@ class Scene_interface; /*! * This virtual class provides the basic functions used for making a plugin. */ -class Polyhedron_demo_plugin_interface +class CGAL_Lab_plugin_interface { public: //! \brief initializes the plugin @@ -57,7 +57,7 @@ protected : }; } } -Q_DECLARE_INTERFACE(CGAL::Three::Polyhedron_demo_plugin_interface, - "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") +Q_DECLARE_INTERFACE(CGAL::Three::CGAL_Lab_plugin_interface, + "com.geometryfactory.CGALLab.PluginInterface/1.0") -#endif // POLYHEDRON_DEMO_PLUGIN_INTERFACE_H +#endif // LAB_DEMO_PLUGIN_INTERFACE_H diff --git a/Three/include/CGAL/Three/Scene_interface.h b/Three/include/CGAL/Three/Scene_interface.h index 64441fe197db..e246abdf2de9 100644 --- a/Three/include/CGAL/Three/Scene_interface.h +++ b/Three/include/CGAL/Three/Scene_interface.h @@ -87,7 +87,7 @@ class Scene_interface { * @returns -1 if the list is empty.*/ virtual Item_id erase(Item_id) = 0; /*! Deletes the items with the target indices. - * @returns the index of the polyhedron just before the + * @returns the index of the item just before the * one that is erased, or just after. Returns -1 if * the list is empty. */ diff --git a/Three/include/CGAL/Three/Scene_print_item_interface.h b/Three/include/CGAL/Three/Scene_print_item_interface.h index 7a36ee942a42..0960a1e447af 100644 --- a/Three/include/CGAL/Three/Scene_print_item_interface.h +++ b/Three/include/CGAL/Three/Scene_print_item_interface.h @@ -61,6 +61,6 @@ class Scene_print_item_interface { } } -Q_DECLARE_INTERFACE(CGAL::Three::Scene_print_item_interface, "com.geometryfactory.PolyhedronDemo.PrintInterface/1.0") +Q_DECLARE_INTERFACE(CGAL::Three::Scene_print_item_interface, "com.geometryfactory.CGALLab.PrintInterface/1.0") #endif // SCENE_PRINT_ITEM_INTERFACE_H diff --git a/Three/include/CGAL/Three/Scene_transparent_interface.h b/Three/include/CGAL/Three/Scene_transparent_interface.h index 3b93c01faf7f..5b68d29926f6 100644 --- a/Three/include/CGAL/Three/Scene_transparent_interface.h +++ b/Three/include/CGAL/Three/Scene_transparent_interface.h @@ -31,5 +31,5 @@ class Scene_transparent_interface { }; } } -Q_DECLARE_INTERFACE(CGAL::Three::Scene_transparent_interface, "com.geometryfactory.PolyhedronDemo.TransparentInterface/1.0") +Q_DECLARE_INTERFACE(CGAL::Three::Scene_transparent_interface, "com.geometryfactory.CGALLab.TransparentInterface/1.0") #endif // SCENE_TRANSPARENT_INTERFACE_H diff --git a/Three/include/CGAL/Three/Scene_zoomable_item_interface.h b/Three/include/CGAL/Three/Scene_zoomable_item_interface.h index a9d864b927b1..71221ac911c5 100644 --- a/Three/include/CGAL/Three/Scene_zoomable_item_interface.h +++ b/Three/include/CGAL/Three/Scene_zoomable_item_interface.h @@ -31,5 +31,5 @@ class Scene_zoomable_item_interface { } } -Q_DECLARE_INTERFACE(CGAL::Three::Scene_zoomable_item_interface, "com.geometryfactory.PolyhedronDemo.ZoomInterface/1.0") +Q_DECLARE_INTERFACE(CGAL::Three::Scene_zoomable_item_interface, "com.geometryfactory.CGALLab.ZoomInterface/1.0") #endif // SCENE_ZOOMABLE_ITEM_INTERFACE_H diff --git a/Three/include/CGAL/Three/Three.h b/Three/include/CGAL/Three/Three.h index 1faa93b3ec09..3dac95792a3e 100644 --- a/Three/include/CGAL/Three/Three.h +++ b/Three/include/CGAL/Three/Three.h @@ -40,7 +40,7 @@ namespace CGAL{ namespace Three{ //define enum depending on Qt version -class Polyhedron_demo_plugin_interface; +class CGAL_Lab_plugin_interface; class THREE_EXPORT Three{ public: @@ -84,7 +84,7 @@ class THREE_EXPORT Three{ * a corresponding slot named `on_ActionsName_triggered()` * in the plugin. */ - static void autoConnectActions(CGAL::Three::Polyhedron_demo_plugin_interface* plugin); + static void autoConnectActions(CGAL::Three::CGAL_Lab_plugin_interface* plugin); /*! * Displays in the console a blue text preceded by the mention * "INFO: ".