Maxime Gimeno
251cc372c2
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-08-06 11:35:17 +02:00
Maxime Gimeno
875d1a479e
Shortest_path Fix
...
- Source Points bigger and polylines made a little thicker to make them visible
when they are rendered over an edge.
2015-08-06 11:33:06 +02:00
Sébastien Loriot
296935e1f3
factorize the code to create a sphere
2015-08-06 11:19:26 +02:00
Sébastien Loriot
56976db665
reduce the number of containers used and simplify a bit the code
2015-08-06 10:16:16 +02:00
Sébastien Loriot
1a96343a17
fix control vertex group coloring
2015-08-06 10:16:16 +02:00
Maxime Gimeno
ccedb330aa
Polylines Spheres fixed
...
- The FlatPlusEdges mode has been replaced by the Flat mode and the wireframed spheres has been fixed.
2015-08-06 10:10:07 +02:00
Sébastien Loriot
11bb60f13f
restore the lastest mesh_3 plugin lost after a bad merge conflict resolution
...
It was lost by this merge:
|--
|commit ed3298ee2f
|Merge: ba4ede5 f44c824
|Author: Maxime Gimeno <maxime.gimeno@gmail.com>
|Date: Mon Apr 27 08:50:06 2015 +0200
|
| Merge branch 'Polyhedron-new_opengl_REBASED_to_ignore_reindentations-gf' into CGAL-Qt5_support-GF
|--
2015-08-06 08:58:39 +02:00
Sébastien Loriot
dd3e199fcd
hue is -1 for grey colors
2015-08-05 17:42:58 +02:00
Sébastien Loriot
5619bd3654
only two parameters...
2015-08-05 17:14:55 +02:00
Sébastien Loriot
e18e385062
normal inversion is not applicable if the point set has no normal
2015-08-05 16:08:28 +02:00
Sébastien Loriot
d55283c92f
jet smoothing is breaking normals
2015-08-05 16:08:28 +02:00
Sébastien Loriot
7d726d2766
only reset the patch ids if the color vector was initialized
...
Fixes:
|--
| commit 9d76ae0b2e
| Author: Sébastien Loriot <sebastien.loriot@cgal.org>
| Date: Wed Aug 5 11:10:22 2015 +0200
|
| reset the patch ids of faces when the color is changed
|--
2015-08-05 16:08:28 +02:00
Maxime Gimeno
b98f9be2bf
Polylines fix
...
- draw_edges had no Viewer_interface as argument. I added one and passed it to the polylines draw_edges,
they are now displayed.
2015-08-05 16:06:47 +02:00
Sébastien Loriot
a773d970aa
force item update
2015-08-05 12:01:12 +02:00
Sébastien Loriot
3534515fbf
remove debug output
2015-08-05 12:01:12 +02:00
Sébastien Loriot
586fef3f57
add an (A/B) tag in the name of plugin needing this item selection method
2015-08-05 12:01:12 +02:00
Sébastien Loriot
17b2aa9595
improve point inside polyhedron ui
2015-08-05 12:01:12 +02:00
Sébastien Loriot
79244a4bf7
force point display
2015-08-05 12:01:12 +02:00
Sébastien Loriot
9d76ae0b2e
reset the patch ids of faces when the color is changed
2015-08-05 12:01:12 +02:00
Sébastien Loriot
564ca2afc8
changed() is already called by SetColor()
2015-08-05 12:01:12 +02:00
Laurent Rineau
d8e475d2c0
Merge pull request #241 from bo0ts/GraphicsView-better_dependency_check-pmoeller
...
Provide a better dependency check in GraphicsView
2015-08-05 11:27:57 +02:00
Laurent Rineau
6b4be50068
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-08-05 11:24:10 +02:00
Laurent Rineau
508b467203
Merge branch 'CGAL-Qt5_support-GF'
2015-08-05 11:23:40 +02:00
Laurent Rineau
2a59e4ced9
Merge pull request #242 from sloriot/PMP-fix_cc_doc
...
Polygon Mesh Processing: fix doc of "connected components" features
2015-08-05 11:22:27 +02:00
Laurent Rineau
e9b8d6275b
Merge pull request #239 from lrineau/CGAL-Fix_demos_with_Qt_5.2-GF
...
Support Qt-5.2
The use of `QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);` is only for Qt>=5.3.
2015-08-05 10:57:08 +02:00
Sébastien Loriot
413ea747b8
improve ui of advanced skeletonization
2015-08-05 10:39:19 +02:00
Sébastien Loriot
0d4f874d55
rename button to help guessing what is the input
2015-08-05 10:20:34 +02:00
Sébastien Loriot
e63fb1e0fc
fix the orientation of faces in mesh_3 plugin
2015-08-05 10:00:58 +02:00
Sébastien Loriot
5db1450981
avoid segfault when several items are erased at the same time
2015-08-04 18:48:43 +02:00
Laurent Rineau
4144ea2004
Merge pull request #235 from lrineau/CGAL_demos-do_not_build_with_CGAL_WITH_Qt5_OFF-GF
...
Do not build the demo when WITH_CGAL_Qt5=OFF
2015-08-04 18:04:02 +02:00
Laurent Rineau
9fc31e6093
Merge pull request #238 from lrineau/GraphicsView-fix_segment_delaunay_graph_demos-GF
...
Graphics View demos: remove unwanted slots
2015-08-04 18:03:04 +02:00
Philipp Möller
986a7ae77b
Return early when missing dependencies
...
This saves parsing time, indentation depth, keeps messages local and
reduces code complexity.
2015-08-04 16:02:54 +02:00
Philipp Möller
57f97635c2
Report the exact missing dependencies
...
Build a variable with missing dependencies and use that to produce and
error message. Pretty printing could still be improved.
2015-08-04 16:01:35 +02:00
Laurent Rineau
21e6e8bcc1
Merge pull request #227 from lrineau/Testsuite-display_Qt5_version_in_results-GF
...
Display Qt5 version in testsuite result pages (partially tested).
2015-08-04 13:04:22 +02:00
Sébastien Loriot
cabb80a4ae
if no cc is to be removed, do nothing
2015-08-04 12:22:51 +02:00
Sébastien Loriot
74e6f3ea39
remove named parameter not needed
2015-08-04 12:22:51 +02:00
Sébastien Loriot
41be0745a4
testing border cases or keep/remove ccs
2015-08-04 12:22:51 +02:00
Maxime Gimeno
69fd6e1266
Picking Fix
...
- With the new drawing system, the frustum was not modified by gluPickMatrix anymore. This commit make the shader use this matrix.
2015-08-04 12:22:15 +02:00
Laurent Rineau
55c30d0808
Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only
2015-08-04 10:55:26 +02:00
Maxime Gimeno
3030a817e0
Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF
2015-08-04 09:05:43 +02:00
Maxime Gimeno
839d09e82a
ManipulatedFrame fps fix
...
- I used the startTimer(0) to cadence the calls to cutting_plane()
- Now if the plane is spinning, the fast_distance is used.
2015-08-04 09:03:15 +02:00
Laurent Rineau
2a9c1c3843
Demote a slot, to a private function
...
Should fix #234
2015-08-03 17:43:02 +02:00
Laurent Rineau
39ab917ad8
Remove on_actionSaveConstraints_triggered
...
The action was:
- not implemented
- not connected to any slot.
2015-08-03 17:42:53 +02:00
Laurent Rineau
c6e8f8baa2
Do not build the demo when WITH_CGAL_Qt5=OFF
2015-08-03 17:09:52 +02:00
Laurent Rineau
ccbda1a5ee
Merge pull request #232 from lrineau/CGAL-remove_unused_moc_files-GF
...
Remove warnings about unused moc files
2015-08-03 16:47:47 +02:00
Sébastien Loriot
6de3260215
force the display of the intersecting faces
2015-08-03 16:42:38 +02:00
Laurent Rineau
568179e8d6
Cleanup of c5940aab10
2015-08-03 16:41:43 +02:00
Sébastien Loriot
90a5e0e56e
do trigger the redraw
2015-08-03 16:39:40 +02:00
Laurent Rineau
cb0bdd3ad2
Remove warnings about unused moc files
...
Should fix #194 .
2015-08-03 16:27:28 +02:00
Laurent Rineau
0219900e98
This branch targets CGAL-4.6.2, if there is one.
2015-08-03 15:56:04 +02:00