Skip to content

Commit 82bd9a0

Browse files
authored
fix an issue with the offset meshing plugin (#8779)
2 parents 0ecfcb9 + a3e64cf commit 82bd9a0

File tree

5 files changed

+12
-713
lines changed

5 files changed

+12
-713
lines changed

Lab/demo/Lab/CGALlab_macros.cmake

+7-17
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,20 @@ add_dependencies(CGALlab_compile_all_plugins CGALlab_all_plugins)
6363
STRING(TOLOWER "${plugin_implementation_base_name}.json" base_name)
6464
SET(filename "${CMAKE_CURRENT_BINARY_DIR}/${base_name}")
6565
LIST(LENGTH ARG_KEYWORDS size)
66+
SET(keywords "")
6667
if(${size} GREATER 0)
67-
SET(keywords )
68-
FILE(WRITE ${filename} "{ \"Keywords\" : [")
6968
foreach(keyword ${ARG_KEYWORDS})
70-
LIST(APPEND keywords "\"${keyword}\", ")
69+
SET(keywords "${keywords}\"${keyword}\", ")
7170
if(NOT TARGET ${keyword})
7271
add_custom_target(${keyword})
7372
endif()
7473
add_dependencies( ${keyword} ${plugin_name})
7574
endforeach()
76-
LIST(LENGTH keywords size)
77-
math(EXPR size "${size} - 1")
78-
LIST(GET keywords -1 last_element)
79-
LIST(REMOVE_AT keywords ${size})
80-
STRING(LENGTH ${last_element} size)
81-
math(EXPR size "${size} - 2")
82-
STRING(SUBSTRING ${last_element} 0 ${size} last_element)
83-
LIST(APPEND keywords ${last_element})
84-
foreach(keyword ${keywords})
85-
file(APPEND ${filename} ${keyword})
86-
endforeach()
87-
file(APPEND ${filename} "], \n")
88-
string(TIMESTAMP VERSION "%Y-%m-%d %H:%M")
89-
file(APPEND ${filename} "\"ConfigDate\" : \"${VERSION}\" }")
75+
# Remove the last comma and space
76+
string(REGEX REPLACE ", $" "" keywords "${keywords}")
9077
endif()
78+
file(WRITE ${filename} "{\n \"Keywords\" : [ ${keywords} ],\n")
79+
string(TIMESTAMP VERSION "%Y-%m-%d %H:%M")
80+
file(APPEND ${filename} " \"ConfigDate\" : \"${VERSION}\"\n}\n")
9181
CGAL_install_hooks()
9282
endmacro(cgal_lab_plugin)

Lab/demo/Lab/MainWindow.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ bool MainWindow::load_plugin(QString fileName, bool blacklisted)
565565
}
566566
QDebug qdebug = qDebug();
567567
if(verbose)
568-
qdebug << "### Loading \"" << fileName.toUtf8().data() << "\"... ";
568+
qdebug << "### Loading" << fileName << "... ";
569569
QPluginLoader loader;
570570
loader.setFileName(fileinfo.absoluteFilePath());
571571
QJsonArray keywords = loader.metaData().value("MetaData").toObject().value("Keywords").toArray();
@@ -612,6 +612,8 @@ bool MainWindow::load_plugin(QString fileName, bool blacklisted)
612612
}
613613
else{
614614
pluginsStatus_map[name] = loader.errorString();
615+
if(verbose)
616+
qdebug << "\n#### Error: " << loader.errorString();
615617

616618
}
617619
PathNames_map[name].push_back(fileinfo.absoluteDir().absolutePath());

Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ include(CGALlab_macros)
22

33
remove_definitions(-DQT_STATICPLUGIN)
44

5+
set(CMAKE_AUTOMOC ON)
6+
57
qt6_wrap_cpp(VOLUME_MOC_OUTFILES
68
${CMAKE_CURRENT_SOURCE_DIR}/Volume_plane_thread.h)
79
qt6_wrap_cpp(VOLUME_MOC_OUTFILES

Lab/demo/Lab/Plugins/Mesh_3/Offset_meshing_plugin.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#include "config.h"
22

3-
#ifdef CGAL_LAB_DEMO_USE_SURFACE_MESHER
4-
53
#include <CGAL/Three/CGAL_Lab_plugin_interface.h>
64
#include "ui_Offset_meshing_dialog.h"
75

@@ -761,5 +759,3 @@ inflate_mesh()
761759
}
762760

763761
#include "Offset_meshing_plugin.moc"
764-
765-
#endif // CGAL_LAB_DEMO_USE_SURFACE_MESHER

0 commit comments

Comments
 (0)