Merge branch 'CGAL-Qt5_support-GF'

      Fixes various issues in demos
      Improve runtime of Side_of_triangle_mesh

Author: sloriot

AABB_tree/demo/AABB_tree/Scene.cpp

@@ -1230,9 +1230,9 @@ void Scene::cut_segment_plane()
     changed();
 }
 
-void Scene::cutting_plane()
+void Scene::cutting_plane(bool override)
 {
-    if(ready_to_cut)
+    if(ready_to_cut || override)
     {
         ready_to_cut = false;
         switch( m_cut_plane )

AABB_tree/demo/AABB_tree/Scene.h

@@ -256,7 +256,7 @@ class Scene : public QObject
 
 public slots:
     // cutting plane
-    void cutting_plane();
+    void cutting_plane(bool override = false);
     void changed();
 }; // end class Scene
 

AABB_tree/demo/AABB_tree/Viewer.cpp

@@ -18,6 +18,7 @@ void Viewer::setScene(Scene* pScene)
 
 void Viewer::draw()
 {
+  glEnable(GL_DEPTH_TEST);
   QGLViewer::draw();
   if(m_pScene != NULL)
   {
@@ -39,7 +40,7 @@ void Viewer::mousePressEvent(QMouseEvent* e)
   {
     m_pScene->set_fast_distance(true);
     // Refresh distance function
-    m_pScene->cutting_plane();
+    m_pScene->cutting_plane(true);
     m_custom_mouse = true;
   }
 
@@ -53,7 +54,7 @@ void Viewer::mouseReleaseEvent(QMouseEvent* e)
     m_pScene->set_fast_distance(false);
     // Recompute distance function
     QApplication::setOverrideCursor(Qt::WaitCursor);
-    m_pScene->cutting_plane();
+    m_pScene->cutting_plane(true);
     QApplication::restoreOverrideCursor();
 
     m_custom_mouse = false;

Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp

@@ -232,7 +232,7 @@ void Viewer::compile_shaders()
     //Vertex source code
     const char vertex_source[] =
     {
-        "#version 330 \n"
+        "#version 140 \n"
         "in highp vec4 vertex;\n"
         "in highp vec3 normal;\n"
         "in highp vec4 color;\n"
@@ -254,7 +254,7 @@ void Viewer::compile_shaders()
     //Vertex source code
     const char fragment_source[] =
     {
-        "#version 330 \n"
+        "#version 140 \n"
         "in highp vec4 fP; \n"
         "in highp vec3 fN; \n"
         "in highp vec4 fColor; \n"
@@ -310,7 +310,7 @@ void Viewer::compile_shaders()
     //Vertex source code
     const char vertex_source_p_l[] =
     {
-        "#version 330 \n"
+        "#version 140 \n"
         "in highp vec4 vertex;\n"
         "uniform highp mat4 mvp_matrix;\n"
         "void main(void)\n"
@@ -321,7 +321,7 @@ void Viewer::compile_shaders()
     //Vertex source code
     const char fragment_source_p_l[] =
     {
-        "#version 330 \n"
+        "#version 140 \n"
         "uniform highp vec4 color; \n"
         "void main(void) { \n"
         "gl_FragColor = color; \n"

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h

@@ -27,6 +27,7 @@
 #include <CGAL/Triangulation_vertex_base_with_info_3.h>
 #include <CGAL/iterator.h>
 #include <CGAL/trace.h>
+#include <CGAL/use.h>
 
 #include <vector>
 #include <stack>
@@ -61,6 +62,8 @@ class Lookup_table {
     CGAL_assertion(i >= 0 && i < n);
     CGAL_assertion(j >= 0 && j < n);
     CGAL_assertion(i < j); 
+    CGAL_USE(i);
+    CGAL_USE(j);
     // previous implementation was based on directly vector and i supposed to be always smaller than j.
     // this check actually can be removed and i =min(i,j) j = max(i,j) can be used for reflexive access 
     return true;
@@ -122,6 +125,8 @@ class Lookup_table_map {
     CGAL_assertion(i >= 0 && i < n);
     CGAL_assertion(j >= 0 && j < n);
     CGAL_assertion(i < j);
+    CGAL_USE(i);
+    CGAL_USE(j);
     return true;
   }
   Map table;

Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Side_of_triangle_mesh/Ray_3_Triangle_3_traversal_traits.h

@@ -47,7 +47,7 @@ class Ray_3_Triangle_3_traversal_traits
   Ray_3_Triangle_3_traversal_traits(std::pair<boost::logic::tribool,std::size_t>& status,
                                     const AABBTraits& aabb_traits)
     :m_status(status),m_stop(false), m_aabb_traits(aabb_traits)
-  {}
+  {m_status.first=true;}
 
   bool go_further() const { return !m_stop; }
 
@@ -63,7 +63,6 @@ class Ray_3_Triangle_3_traversal_traits
     if (res.first){
       switch (res.second){
         case internal::R3T3_intersection::CROSS_FACET:
-          m_status.first = true;
           ++m_status.second;
         break;
         case internal::R3T3_intersection::ENDPOINT_IN_TRIANGLE:

Polyhedron/demo/Polyhedron/Color_map.h

@@ -14,8 +14,9 @@ compute_color_map(QColor base_color,
 
   qreal h = hue;
   for(unsigned i = 0; i < nb_of_colors; ++i) {
-    h += step;
+    if (h!=-1) h += step;
     if ( h > 1 ) { h -= 1; }
+
     *out++ = QColor::fromHsvF(h, 
                               base_color.saturationF(), 
                               base_color.valueF());

Polyhedron/demo/Polyhedron/Fairing_widget.ui

@@ -76,7 +76,7 @@
        <item>
         <widget class="QPushButton" name="Fair_button">
          <property name="text">
-          <string>Fair</string>
+          <string>Fair a region defined by a selection of vertices</string>
          </property>
         </widget>
        </item>
@@ -116,7 +116,7 @@
        <item>
         <widget class="QPushButton" name="Refine_button">
          <property name="text">
-          <string>Refine</string>
+          <string>Refine a region defined by a selection of faces</string>
          </property>
         </widget>
        </item>

Polyhedron/demo/Polyhedron/MainWindow.cpp

@@ -190,6 +190,9 @@ MainWindow::MainWindow(QWidget* parent)
   connect(scene, SIGNAL(updated_bbox()),
           this, SLOT(updateViewerBBox()));
 
+  connect(scene, SIGNAL(selectionChanged(int)),
+          this, SLOT(selectSceneItem(int)));
+
   connect(sceneView->selectionModel(), 
           SIGNAL(selectionChanged ( const QItemSelection & , const QItemSelection & ) ),
           this, SLOT(updateInfo()));

Polyhedron/demo/Polyhedron/MainWindow.ui

@@ -363,23 +363,23 @@
   </action>
   <action name="actionUnion">
    <property name="text">
-    <string>&amp;Union</string>
+    <string>&amp;Union (A/B)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O, U</string>
    </property>
   </action>
   <action name="actionIntersection">
    <property name="text">
-    <string>&amp;Intersection</string>
+    <string>&amp;Intersection (A/B)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O, I</string>
    </property>
   </action>
   <action name="actionDifference">
    <property name="text">
-    <string>&amp;Difference</string>
+    <string>&amp;Difference (A/B)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O, D</string>
@@ -603,7 +603,7 @@
   </action>
   <action name="actionMinkowskiSum">
    <property name="text">
-    <string>&amp;Minkowski sum</string>
+    <string>&amp;Minkowski sum (A/B)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+O, M</string>