songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
68,627 Commits 3 Branches 156 Tags 974 MiB
Commit Graph

3056 Commits

Author SHA1 Message Date
Maxime Gimeno c2f02afee5 Enhancement 
- Moved the code to read an .obj file to OBJ_reader.h
- Made it compatible with not triangle objects.
 2016-06-09 16:16:18 +02:00
Maxime Gimeno 3db5a1f6b2 Fix for the OBJ reading. 2016-06-09 09:52:54 +02:00
Sebastien Loriot 86cb16b77f Merge pull request #1137 from maxGimeno/Polyhedron_demo-Fix_viewer_update-GF 
Polyhedron_demo : Fix the update of the viewer
 2016-06-08 14:30:10 +02:00
Sebastien Loriot 1ebaebc6aa Merge pull request #1101 from maxGimeno/Enhance_triangulate_facets-GF 
Robustify triangulate facets
 2016-06-08 09:50:48 +02:00
Maxime Gimeno eff2126be1 Fix the update of the viewer 
- replaces updateGL() calls by update() calls. Before the viewer used a painter, updateGL() was ok, because it was the QGLViewer that painted the scene. But a QPainter can only update its painting through a paintEvent() function, which is called by update() but not by updateGL().
- Fixes the bug that made the selection empty when an item was erased.
- Fixes the background color.
 2016-06-06 15:10:58 +02:00
Maxime Gimeno 6090b89123 Fixes the contextMenu. 2016-06-02 15:40:24 +02:00
Sebastien Loriot ef6f7f8faa Merge pull request #1126 from maxGimeno/Polyhedron_demo-Fix_spheres_item_in_polylines-GF 
Polyhedron_demo: Fix for the Spheres_item and the Scene_polyline_item
 2016-06-02 15:19:25 +02:00
Sebastien Loriot 26081a2608 Merge pull request #1123 from maxGimeno/Polyhedron_demo-Fix_ChangeGroup-GF 
polyhedron_demo : Fix ChangeGroup
 2016-06-02 15:17:02 +02:00
Sebastien Loriot a9b177fe71 Merge pull request #1121 from maxGimeno/Polyhedron_demo-_display_distance_between_points-GF 
Polyhedron_demo: Display distance between points
 2016-06-02 15:16:13 +02:00
Sebastien Loriot f546d49366 Merge pull request #1117 from maxGimeno/Fix_selection_tool-GF 
Fix selection tool
 2016-06-02 15:15:11 +02:00
Sébastien Loriot 472980a478 Merge pull request #1075 from maxGimeno/Polyhedron_demo-Handle_gray_images-rebase-GF 
Polyhedron demo : Handle gray images
 2016-06-02 15:06:49 +02:00
Sébastien Loriot 1a2fa813db fix warnings when vtk is not here 2016-06-02 09:16:53 +02:00
Maxime Gimeno 60d18a01cd Fixes : 
- It is possible again to change the radii of the spheres in a polyline
- Reloading a group from file won't cause the demo to crash anymore.
 2016-06-01 12:40:23 +02:00
Maxime Gimeno d34d7d5591 Fix errors when VTK is not found. 2016-06-01 10:36:50 +02:00
Sebastien Loriot cf15f57a50 Merge pull request #1097 from lrineau/Mesh_3-improve_polylines_to_protect-GF 
Mesh 3: add an example that protects features of a 3D image
 2016-05-31 16:00:58 +02:00
Maxime Gimeno 5899e3dd3c Fix 
- Fixes the behaviour when removing from scene with no item selected, that could cause a segfault in some cases.
 2016-05-31 14:42:24 +02:00
Maxime Gimeno 46e13ba697 Fix 
- When D was not released, the text was not cleared.
- Set the distance line bold.
 2016-05-31 10:39:25 +02:00
Sébastien Loriot 3046912017 use CamelCase for all MainWindow actions 2016-05-30 17:21:58 +02:00
Sébastien Loriot 530aa85e56 fix action and slot names 2016-05-30 17:13:33 +02:00
Sébastien Loriot 0ded764e71 fix signal name to allow auto-connection 2016-05-30 17:08:28 +02:00
Maxime Gimeno 2e20e8804b Fix meshing of gray images. 2016-05-30 15:06:55 +02:00
Maxime Gimeno 5edc0f89d8 Reduce copy/pasted code 2016-05-30 12:23:43 +02:00
Maxime Gimeno d4dc2cbc53 fix segfault in default constructor of selection-items 2016-05-30 10:34:17 +02:00
Maxime Gimeno c62ce2da10 Fixes 
- Make only the selected selection_item active.
- Fix for the segfaults in edition_mode with no selection_item
- Creates a selection_item even if there are more than one item in the scene

Conflicts:
	Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_item_k_ring_selection.h
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
 2016-05-30 10:33:30 +02:00
Maxime Gimeno 084662ea87 Print the information on screen. 2016-05-27 17:02:08 +02:00
Jane Tournois 748f0ffded comment until it's implemented 
I prefer not to remove it completely
 2016-05-27 16:07:25 +02:00
Maxime Gimeno aa51101d29 Merge branch 'Polyhedron_demo-_display_distance_between_points-GF-old' into Polyhedron_demo-_display_distance_between_points-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Viewer.cpp
	Polyhedron/demo/Polyhedron/Viewer.h
 2016-05-27 16:06:48 +02:00
Jane Tournois 63d2a2a4dc remove default values and rename variable 2016-05-27 15:49:50 +02:00
Maxime Gimeno cd4c24b4ad Warning fix 2016-05-27 15:17:06 +02:00
Maxime Gimeno f3f44a4dda Reduce pasted code. 2016-05-27 15:04:45 +02:00
Maxime Gimeno f29107e578 use vector::data instead of the address of the first element. 2016-05-27 13:00:16 +02:00
Maxime Gimeno 28f7ae212a Fix Compilation Errors in case VTK is not found. 2016-05-27 12:30:34 +02:00
Jane Tournois 4e2593d911 Merge branch 'Polyhedron_demo-Handle_gray_images-rebase-GF' of github.com:maxGimeno/cgal into Polyhedron_demo-Handle_gray_images-rebase-GF 2016-05-27 11:13:36 +02:00
Jane Tournois 4cd78c0fa7 add a warning message 2016-05-27 11:08:29 +02:00
Jane Tournois 05c1224b95 rename group and shorten code 2016-05-27 10:49:59 +02:00
Jane Tournois 6acdbfbc6f use variable features_protection_available 
to make ui.protect checkbox available or not
 2016-05-27 10:43:08 +02:00
Jane Tournois 16f737a178 avoid selection list to move when value changes 2016-05-27 10:37:17 +02:00
Sébastien Loriot ed5e06f341 pass the value to the base class 2016-05-26 18:02:12 +02:00
Jane Tournois cad7413a77 fix typo and add tooltips 2016-05-26 17:30:23 +02:00
Jane Tournois 576a30ac35 re-indent 2016-05-26 17:25:05 +02:00
Sébastien Loriot 11b8eb428b Merge pull request #558 from maxGimeno/Polyhedron_demo-display_indices_of_primitives-GF 
Display indices of Polyhedron_item primitives in Polyhedron_demo
 2016-05-26 17:09:23 +02:00
Maxime Gimeno 39a4ad8534 Makes the parameters for the meshing of gray images editable by the user. 2016-05-26 09:41:00 +02:00
Sébastien Loriot 06e553ccff remove warning 2016-05-25 17:56:57 +02:00
Maxime Gimeno 9abe59c917 Fix the bug of single textItems on multiple scene_items. 2016-05-25 17:02:26 +02:00
Sébastien Loriot 5f0a9dcbf3 Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch' 2016-05-24 16:54:58 +02:00
Maxime Gimeno 56caa543f0 Fixes the Splatting draw code which fixes the picking problem. 2016-05-24 16:20:46 +02:00
Maxime Gimeno d694903fc9 Adds a warning message in the plugin if all the facets were not triangulated. 2016-05-23 17:01:27 +02:00
Jane Tournois caae6db52b deal with boundaries 2016-05-23 16:15:22 +02:00
Jane Tournois a500441784 delete selected edges before it's too late 
when erase_selected_facets is called, the selected edges that are in the
middle of the selected area should be deleted before they get invalidated
by the face removal
 2016-05-23 15:38:00 +02:00
Sébastien Loriot bc02ce7fdf no need to connect twice 2016-05-23 12:17:00 +02:00