From 565d5413b0c8f4f258ea417dffd09ff9c767dc57 Mon Sep 17 00:00:00 2001 From: Nicolas Saillant Date: Mon, 5 Aug 2024 15:51:05 +0200 Subject: [PATCH] Restructure third party libraries in a table format --- Installation/CMakeLists.txt | 3 +- Maintenance/test_handling/Summary_Script.js | 21 ++++++++++++-- Maintenance/test_handling/testresult.css | 32 +++++++++++++++++++++ TDS_3/test/TDS_3/CMakeLists.txt | 2 +- 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 31753bc1133..3fcf60bf4d4 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -482,8 +482,7 @@ endif() set(LIBRARIES_TO_CHECK Boost GMP MPFR VTK Qt6 Eigen3 OpenGR libpointmatcher LEDA MPFI - NTL TBB OpenCV METIS ZLIB - Ceres GLPK SCIP OSQP + TBB OpenCV METIS ZLIB GLPK SCIP ) function(check_library cgal_3rdparty_lib) diff --git a/Maintenance/test_handling/Summary_Script.js b/Maintenance/test_handling/Summary_Script.js index 67d49d75215..a16f4861f60 100644 --- a/Maintenance/test_handling/Summary_Script.js +++ b/Maintenance/test_handling/Summary_Script.js @@ -167,12 +167,29 @@ function packageContainer(platforms) { } } - function platformContainer(platforms) { platforms.forEach(platform => { const $container = $('
', { class: 'platform ' + platform.name }).appendTo($platformContainer); $container.html("

Results of " + platform.name + "

"); - $('

', { class: 'tplinfo', html: platform.third_party_libraries }).appendTo($container); + + // Parse third_party_libraries and structure them in a table format + const tplString = platform.third_party_libraries.replace("TPL: ", "").trim(); + const tplArray = tplString.split(",").map(tpl => tpl.trim()).filter(tpl => tpl.length > 0); + + const $tplTable = $('', { class: 'tpl-table' }).appendTo($container); + const $thead = $('').appendTo($tplTable); + const $tbody = $('').appendTo($tplTable); + + $('').append('').appendTo($thead); + + let $row = $('').appendTo($tbody); + tplArray.forEach((tpl, index) => { + if (index > 0 && index % 5 === 0) { + $row = $('').appendTo($tbody); + } + $('
Third Party Libraries
').text(tpl).appendTo($row); + }); + const letters = ['n', 'w', 'o', 'r']; letters.forEach(letter => { const $letterContainer = $('
', { class: 'letter_container ' + letter }).appendTo($container); diff --git a/Maintenance/test_handling/testresult.css b/Maintenance/test_handling/testresult.css index 94a1c213a85..faece0618c6 100644 --- a/Maintenance/test_handling/testresult.css +++ b/Maintenance/test_handling/testresult.css @@ -115,4 +115,36 @@ TABLE.result TD > a.package_name { .platform-link { margin-right: 10px; +} + +/* Summary Page */ + +.tpl-table { + width: auto; + border-collapse: collapse; + margin-top: 10px; + table-layout: fixed; +} + +.tpl-table th, .tpl-table td { + border: 1px solid #e0e0e0; /* Couleur légèrement différente */ + padding: 4px 8px; + text-align: left; + white-space: nowrap; +} + +.tpl-table tr:nth-child(even) { + background-color: #fafafa; +} + +.tpl-table tr:hover { + background-color: #f5f5f5; +} + +.tpl-table th { + padding-top: 8px; + padding-bottom: 8px; + background-color: #f7f7f7; + color: #333; + font-weight: normal; } \ No newline at end of file diff --git a/TDS_3/test/TDS_3/CMakeLists.txt b/TDS_3/test/TDS_3/CMakeLists.txt index f35a84763a5..a80cd824ea3 100644 --- a/TDS_3/test/TDS_3/CMakeLists.txt +++ b/TDS_3/test/TDS_3/CMakeLists.txt @@ -12,6 +12,6 @@ create_single_source_cgal_program("test_triangulation_tds_3.cpp") create_single_source_cgal_program("test_io_tds3.cpp") if(TARGET CGAL::TBB_support) - message(STATUS "Third-parties libraries TBB ${TBB_VERSION}") + message(STATUS "Found TBB") target_link_libraries(test_triangulation_tds_3 PUBLIC CGAL::TBB_support) endif()