Commit Graph

3374 Commits

Author SHA1 Message Date
Maxime Gimeno 5e932915cd Fix Points color 2016-07-19 10:31:46 +02:00
Maxime Gimeno d0c6a889f2 Fix the segfault. 2016-07-19 10:25:55 +02:00
Simon Giraudot 1edb7d2c63 Apply PSP algorithms to selection only (if selection isn't empty) 2016-07-18 15:26:34 +02:00
Maxime Gimeno f7e004be7c Fix the Bbox 2016-07-15 13:54:10 +02:00
Maxime Gimeno c63a36f15a Remove Untriangulate facets 2016-07-15 12:58:36 +02:00
Laurent Rineau 7b9f11b3d4 Merge pull request #1260 from lrineau/Mesh_3-improve_IO-GF
Mesh:3 improve dump_c3t3 (Parallel_tag, Polyhedra;_mesh_domain_3)
2016-07-13 16:16:24 +02:00
Laurent Rineau 094fa1f926 Merge pull request #1244 from maxGimeno/Restore_snapshots-GF
Polyhedron_demo: Restore snapshots
2016-07-13 16:15:09 +02:00
Laurent Rineau c5d5294c25 Merge pull request #1263 from maxGimeno/Fix_extra_time_reload-GF
Polyhedron_demo: Fix reload item

This PR actually fixes a general performance issue, due to the use of Boost `flat_map` container. The unique hash map from CGAL has been used instead.
2016-07-13 16:12:42 +02:00
Maxime Gimeno e489669b47 Minor fix
- Remove the std::cerr in the `message()` function of the Mainwindow to avoid having html messages in the console.
- The messages using this function will only be readable in the application's console widget.
2016-07-13 10:22:01 +02:00
Maxime Gimeno b2871b656a Clean up other flat_map in normal calculation. 2016-07-13 09:51:47 +02:00
Laurent Rineau 27c6d122cb Fix the long list of targets 2016-07-12 16:48:02 +02:00
Laurent Rineau f430cf9a82 Fix compilation errors
Specialization of I/O support for `std::pair<int, int>` was defined
twice.

For the records, the compilation errors were:
```
[ 62%] Building CXX object Plugins/Mesh_3/CMakeFiles/c3t3_io_plugin.dir/C3t3_io_plugin.cpp.o
cd /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3 && /usr/bin/c++   -DCGAL_EIGEN3_ENABLED -DCGAL_TEST_SUITE -DCGAL_USE_GMP -DCGAL_USE_MPFR -DCGAL_USE_ZLIB -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NO_KEYWORDS -DQT_OPENGL_LIB -DQT_SCRIPT_LIB -DQT_WIDGETS_LIB -DQT_XML_LIB -DSCENE_IMAGE_GL_BUFFERS_AVAILABLE -DUSE_FORWARD_DECL -Dc3t3_io_plugin_EXPORTS -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3 -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./CGAL_demo -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/../../include -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./include -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/. -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo -I/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/include -I/mnt/testsuite/include -isystem /usr/include/eigen3 -isystem /usr/include/qt -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtCore -isystem /usr/lib/qt/mkspecs/linux-g++ -isystem /usr/include/qt/QtScript -isystem /usr/include/qt/QtOpenGL -isystem /usr/include/qt/QtXml  -fvisibility=hidden -fPIC   -fPIC -o CMakeFiles/c3t3_io_plugin.dir/C3t3_io_plugin.cpp.o -c /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp
/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp:299:8: error: redefinition of 'struct CGAL::Get_io_signature<std::pair<int, int> >'
 struct Get_io_signature<Fake_patch_id> {
        ^
In file included from /mnt/testsuite/include/CGAL/Polyhedral_mesh_domain_3.h:61:0,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./C3t3_type.h:24,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./Scene_c3t3_item.h:5,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp:2:
/mnt/testsuite/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h:31:8: error: previous definition of 'struct CGAL::Get_io_signature<std::pair<int, int> >'
 struct Get_io_signature<std::pair<int, int> > {
        ^
/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp:319:7: error: redefinition of 'class CGAL::Output_rep<std::pair<int, int> >'
 class Output_rep<Fake_patch_id> {
       ^
In file included from /mnt/testsuite/include/CGAL/Polyhedral_mesh_domain_3.h:61:0,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./C3t3_type.h:24,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./Scene_c3t3_item.h:5,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp:2:
/mnt/testsuite/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h:46:7: error: previous definition of 'class CGAL::Output_rep<std::pair<int, int> >'
 class Output_rep<std::pair<int, int> > : public IO_rep_is_specialized {
       ^
/home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp:338:7: error: redefinition of 'class CGAL::Input_rep<std::pair<int, int> >'
 class Input_rep<Fake_patch_id> {
       ^
In file included from /mnt/testsuite/include/CGAL/Polyhedral_mesh_domain_3.h:61:0,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./C3t3_type.h:24,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/./Scene_c3t3_item.h:5,
                 from /home/cgal_tester/build/src/cmake/platforms/ArchLinux-CXX14/test/Polyhedron_Demo/Plugins/Mesh_3/C3t3_io_plugin.cpp:2:
/mnt/testsuite/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h:65:7: error: previous definition of 'class CGAL::Input_rep<std::pair<int, int> >'
 class Input_rep<std::pair<int, int> > : public IO_rep_is_specialized {
       ^
Plugins/Mesh_3/CMakeFiles/c3t3_io_plugin.dir/build.make:66: recipe for target 'Plugins/Mesh_3/CMakeFiles/c3t3_io_plugin.dir/C3t3_io_plugin.cpp.o' failed
```
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.9-Ic-97/Polyhedron_Demo/TestReport_lrineau_ArchLinux-CXX14.gz
2016-07-12 16:47:39 +02:00
Maxime Gimeno 7dca16a1fc Clean-up 2016-07-12 15:54:44 +02:00
Maxime Gimeno 590c0f9f75 Fix
- By replacing the flat_map by another type of map, the bug that made the calculation of items longer after several reloads is fixed. Why this bug only appeared when reloading an item stays an unsolved mystery.
2016-07-12 15:38:45 +02:00
Laurent Rineau 6f15e738b6 Merge pull request #1227 from maxGimeno/Multiple_fix-GF
Polyhedron_demo : Rework UIs and add waitcursors to items
2016-07-12 11:16:57 +02:00
Maxime Gimeno af7998026c Use CamelCase for UI. 2016-07-08 15:25:30 +02:00
Maxime Gimeno 5d1da468bf Move the projectionMatrix to the private struct and fix a warning 2016-07-08 11:11:24 +02:00
Sebastien Loriot be27bf69b7 Merge pull request #1198 from maxGimeno/Import_AABB_Tree_demo-GF
Polyhedron_Demo: Import AABB_Tree demo
2016-07-07 13:37:55 +02:00
Maxime Gimeno 416c23bd1e Add an option to keep the ratio.
- Using #include "Viewer.moc" in the .cpp makes the use of qt5_generate_moc useless i nthe CMakeLists, as Automoc is now able to deal with it.
2016-07-07 09:31:24 +02:00
Maxime Gimeno 07f94ebf0b Fix display info and indicate current state of the plugin in the menu. 2016-07-06 17:19:12 +02:00
Maxime Gimeno 3e36894696 Second way
- I finally found a solution to set manually the frustum ! This version use the same algorithm as did QGLViewer so all of the previous version problems are gone.
2016-07-06 14:40:49 +02:00
Maxime Gimeno 79f49cfec8 First way
- pass the camera in orthographic mode and zoom on screen part to recreate the original image with zoomed parts. If the factor is too high, there will be near plane problems, as the zoom might make the camera go through the item. Plus the separation between the parts is visible. At last, everything that is not centered in the screen will be deformed because of the orthographic projection.
2016-07-06 11:08:19 +02:00
Laurent Rineau 5ebfefe72c Merge pull request #894 from gdamiand/CGAL_headers_only_step1-gdamiand_cjamin
CGAL header-only: step 1

(I actually do this merge for the Github interface for mobile phones! How much does that add to my geek-value?)
2016-07-05 19:50:36 +02:00
Sébastien Loriot 8c3b4f40c5 add missing () 2016-07-05 16:47:11 +02:00
Maxime Gimeno 9adbc52f8b Fix segfault 2016-07-05 16:21:07 +02:00
Sebastien Loriot 6e8138ca5a Merge pull request #1240 from maxGimeno/Submenu_for_PSP-GF
Polyhedron_demo : Submenu for Point Set Processing Operations
2016-07-05 16:13:25 +02:00
Sébastien Loriot d2a7e55685 add more plugin in the Point Set submenu 2016-07-05 16:09:59 +02:00
Sebastien Loriot a972847c8f Merge pull request #1239 from maxGimeno/Change_normal_length-GF
Polyhedron_demo: Fix the Normal Drawing
2016-07-05 16:01:21 +02:00
Maxime Gimeno 18e11fe419 Change functors name. 2016-07-05 15:58:44 +02:00
Sébastien Loriot 1f42d4013b remove unused parameter 2016-07-05 15:58:44 +02:00
Maxime Gimeno e5db243366 Parallelize the texture computing if linked with TBB.
On elephant.off, the computation is done in 250 ms when parallelized
against 600ms when not.
2016-07-05 15:58:44 +02:00
Maxime Gimeno 4ebaa0de73 Fix updating bugs at creation and deletion of items. 2016-07-05 15:58:44 +02:00
Maxime Gimeno fc68989e60 Use Simple_cartesian<double> to greatly enhance the performance. 2016-07-05 15:58:43 +02:00
Maxime Gimeno a761fb97e9 Use more vivid colors for the textured plane. 2016-07-05 15:58:43 +02:00
Maxime Gimeno 16fe012931 Fix
- Fix LINK errors
- Fix openGL errors
2016-07-05 15:58:43 +02:00
Maxime Gimeno b99bd48c9d Fixes :
- Fix segfault due to eventFilter
- Fix display for cut edges.
- Tries to fix the include bug.
2016-07-05 15:58:43 +02:00
Maxime Gimeno a1f8a161d8 Replace the AABB_Tree demo's Color_ramp by the one already present in the Polyhedron demo. 2016-07-05 15:58:43 +02:00
Maxime Gimeno 529fa3dfd6 Fix
- Fixes link error and display in cut_segments
2016-07-05 15:58:43 +02:00
Maxime Gimeno 5fd4ff01f5 Fix
- update the plane and the trees when an item is added.
2016-07-05 15:58:42 +02:00
Maxime Gimeno 3d84bff91f Fix segfaults 2016-07-05 15:58:42 +02:00
Maxime Gimeno c6c3115998 Enhancement
- Implement the distance functions in the Cut plugin.
2016-07-05 15:58:42 +02:00
Sebastien Loriot ba0dc000c6 Merge pull request #1241 from maxGimeno/Fix_selection_after_reload-GF
Polyhedron_demo: Fix the selection after reloading an item.
2016-07-05 15:55:57 +02:00
Sebastien Loriot 4c70258a91 Merge pull request #1224 from maxGimeno/Interference_plugin-GF
Polyhedron_demo: Point_set_interference_plugin
2016-07-05 15:34:22 +02:00
Maxime Gimeno ab17f12ae1 Rename Dialogs with no name. 2016-07-04 11:24:12 +02:00
Maxime Gimeno 51d08adce0 Set a maximum for the normal lengths. 2016-07-04 11:17:31 +02:00
Maxime Gimeno 04d80304e9 Add spaces and change Dialog name. 2016-07-04 11:12:16 +02:00
Maxime Gimeno b42ca7b0e9 Fix the selection after reloading an item. 2016-07-04 11:02:08 +02:00
Maxime Gimeno 4978791fb7 Put Point set processing operations in a submenu. 2016-07-04 10:35:44 +02:00
Maxime Gimeno 997f32b615 Interface enhancements. 2016-07-01 12:55:44 +02:00
Maxime Gimeno 3255492953 Remove duplicated file. 2016-06-30 15:39:56 +02:00
Maxime Gimeno 272d3278be Add WaitCursors to items. 2016-06-30 15:34:21 +02:00
Maxime Gimeno 7e62849807 Rework of FileLoader UI 2016-06-30 14:37:59 +02:00
Maxime Gimeno 73d9b0abdc Rework of Deformation UI 2016-06-30 14:35:26 +02:00
Maxime Gimeno 55586279e2 Rework of Remeshing UI 2016-06-30 14:32:29 +02:00
Maxime Gimeno 195f7c62dd Rework of Mesh_segmentation UI 2016-06-30 14:31:22 +02:00
Maxime Gimeno cf432b11a7 Rework of Point_set_reconstruction UI 2016-06-30 14:29:36 +02:00
Maxime Gimeno b49bbfb1f0 Rework of Point_set_wlop UI 2016-06-30 14:21:41 +02:00
Maxime Gimeno 037fefba23 Rework of Point_set_upsampling UI 2016-06-30 14:21:01 +02:00
Maxime Gimeno 2a80c87715 Rework of Point_set_simplification UI 2016-06-30 14:19:18 +02:00
Maxime Gimeno fff122dded Rework of Point_set_shape_detection UI 2016-06-30 14:18:34 +02:00
Maxime Gimeno 1098e85d99 Rework of Point_set_simplification UI 2016-06-30 14:17:03 +02:00
Maxime Gimeno 8d951b5b62 Rework Bilateral smoothing UI 2016-06-30 14:14:38 +02:00
Maxime Gimeno cdcf9402a7 Rework Features_detection UI 2016-06-30 14:13:52 +02:00
Maxime Gimeno a614c5a260 Rework Isotropic_remeshing UI 2016-06-30 14:11:09 +02:00
Maxime Gimeno ce9fc9c45c Rework of the Local_optimizer_dialog 2016-06-30 13:58:26 +02:00
Maxime Gimeno 9854c48f29 Rework of the Smoother_dialog 2016-06-30 13:46:00 +02:00
Maxime Gimeno e94ba97fb9 Rework Mesh_3 UI 2016-06-30 13:12:05 +02:00
Maxime Gimeno dc58edfbe6 Rework Implicit_function UI. 2016-06-30 12:53:02 +02:00
Maxime Gimeno 5f88f74196 Rework Io_image_plugin UI. 2016-06-30 12:49:55 +02:00
Maxime Gimeno 297df827eb Rework Mesh_2 UI 2016-06-30 12:49:44 +02:00
Maxime Gimeno 7339db163a Fix isotropic_remeshing color bug. 2016-06-30 11:45:38 +02:00
Maxime Gimeno cb4b6650eb Implementation
- New plugin allowing to create noise in a point set.
2016-06-30 10:10:35 +02:00
Sebastien Loriot f3e5e81d79 Merge pull request #1219 from maxGimeno/Add_a_spacer-GF
Polyhedron_demo : Trivial UI change in Point_inside_polyhedron_plugin
2016-06-29 14:06:29 +02:00
Sebastien Loriot b3dc4a8595 Merge pull request #1221 from maxGimeno/Fix_Point_set_smoothing-GF
Polyhedron_demo: Fix Point_set_smoothing_plugin
2016-06-29 14:06:07 +02:00
Sebastien Loriot a414c0be61 Merge pull request #1212 from maxGimeno/Restore_snapshots-GF
Polyhedron_demo : Restore the Snapshot feature.
2016-06-29 14:00:48 +02:00
Sebastien Loriot 46980d547f Merge pull request #1207 from maxGimeno/Fix_implicit_function-GF
Polyhedron-demo : Fix display issue with Scene_implicit_function_item
2016-06-29 13:56:47 +02:00
Sebastien Loriot 997f5550db Merge pull request #1215 from maxGimeno/On_the_fly_selection_item-GF
Polyhedron_demo: On the fly selection_item
2016-06-29 13:52:58 +02:00
Sebastien Loriot 7148b3abcf Merge pull request #1213 from maxGimeno/Fix_bilateral_smoothing-GF
Polyhedron_demo: Fix bilateral_smoothing
2016-06-29 13:50:50 +02:00
Sebastien Loriot 9f0c23c4c9 Merge pull request #1209 from maxGimeno/keep_patch_ids_after_deformation-GF
Polyhedron_demo : Keeping colors after deformation
2016-06-29 13:49:25 +02:00
Sebastien Loriot 5f33306831 Merge pull request #1205 from maxGimeno/Add_mesh_info_in_c3t3_item-GF
Polyhedron_demo : Add the meshing parameters to the item's tooltip
2016-06-29 13:48:04 +02:00
Sebastien Loriot 198c1f71bf Merge pull request #1201 from maxGimeno/Fix_deformation-GF
Polyhedron_demo : Fix deformation
2016-06-29 13:46:51 +02:00
Maxime Gimeno 9c610f9cf9 Add a spacer. 2016-06-29 10:58:44 +02:00
Sebastien Loriot 5e08127cf8 Merge pull request #1223 from maxGimeno/Fix_selection_after_erase_item-GF
Polyhedron_demo: Fixes the selection after erasing items
2016-06-29 10:57:12 +02:00
Maxime Gimeno 5ea36f942e Fixes the selection after erasing items. 2016-06-29 10:48:49 +02:00
Maxime Gimeno 247ec7fd82 Fix the SEGFAULT 2016-06-29 10:13:39 +02:00
Laurent Rineau 1394b6e5fa Restore the richtext formatting 2016-06-28 19:00:38 +02:00
Maxime Gimeno af8bf047bb Factorize item creation. 2016-06-28 15:37:15 +02:00
Maxime Gimeno d76091195a Enhancement
- Creates a scene_polyhedron_selection_item for the currently selected scene_polyhedron_item if none exists and a button is clicked in the widget.
2016-06-28 15:26:22 +02:00
Maxime Gimeno ce55073dfb Initialize is_selected in Scene_item to avoid unjustified color changes. 2016-06-28 14:29:38 +02:00
Maxime Gimeno 5b72963f95 Triggers a warning if the selected point set has no normals. 2016-06-28 14:08:41 +02:00
Maxime Gimeno 615332b8ae Keep read-only property for the color_vector of the item. 2016-06-28 12:54:14 +02:00
Maxime Gimeno 5cb2823b3f Restore the Snapshot feature. 2016-06-28 10:13:14 +02:00
Sébastien Loriot 5404431ebd remove debug info 2016-06-27 19:36:50 +02:00
Maxime Gimeno b265d26a53 Save Colors_ vector when converting to edit_item and restore it when converting to poly_item. 2016-06-27 15:17:06 +02:00
Maxime Gimeno f2cea4d7a0 Fix the display
- The translation was done twice : once in the position and once in the frame matrix. The fix computes the position of the plane and the grid centered on O(0,0,0), so only the frame's transformation is kept.
2016-06-27 14:16:01 +02:00
Jane Tournois 46799a29fa selection type is "connected component", not "selected" 2016-06-27 13:08:37 +02:00
Maxime Gimeno 4bacb4bd3f Add the information to the item's tooltip. 2016-06-27 12:58:41 +02:00
Guillaume Damiand e02ac7f7f0 Remove link with zlib (that we introduced before but which are no more required) 2016-06-24 18:35:37 +02:00
Sébastien Loriot 10cadcb985 Merge remote-tracking branch 'cgal-dev/CGAL_headers_only_step1-gdamiand_cjamin' into HEAD 2016-06-24 17:05:40 +02:00
Maxime Gimeno 58abbcc30a Fix
- Keep the contorl groups after remeshing.
2016-06-24 15:27:42 +02:00