- Warning
 - orientation
 - Plugin pictures
This commit is contained in:
Maxime Gimeno 2017-06-07 10:52:22 +02:00
parent 90e647f0c2
commit 6fff279f7a
7 changed files with 24 additions and 20 deletions

View File

@ -1070,20 +1070,20 @@ make_grid(typename boost::graph_traits<Graph>::vertices_size_type i,
if(triangulated)
{
face[0] = v_vertices[w*b+a];
face[1] = v_vertices[w*(b+1)+ a+1];
face[2] = v_vertices[w*b+a+1];
face[1] = v_vertices[w*b+a+1];
face[2] = v_vertices[w*(b+1)+a];
Euler::add_face(face, g);
face[0] = v_vertices[w*(b+1)+ a];
face[0] = v_vertices[w*b+a+1];
face[1] = v_vertices[w*(b+1)+a+1];
face[2] = v_vertices[w*b+a];
face[2] = v_vertices[w*(b+1)+a];
Euler::add_face(face, g);
}
else
{
face[0] = v_vertices[w*b+ a];
face[1] = v_vertices[w*(b+1)+ a];
face[1] = v_vertices[w*b+ a+1];
face[2] = v_vertices[w*(b+1)+ a+1];
face[3] = v_vertices[w*b+ a+1];
face[3] = v_vertices[w*(b+1)+ a];
Euler::add_face(face, g);
}
}

View File

@ -135,9 +135,9 @@ void Basic_generator_plugin::on_tab_changed()
nb = nbs[PRISM];
QPixmap pic;
if(dock_widget->prismCheckBox->isChecked())
pic = QPixmap(":/cgal/Polyhedron_3/resources/base.png");
pic = QPixmap(":/cgal/Polyhedron_3/resources/prism.png");
else
pic = QPixmap(":/cgal/Polyhedron_3/resources/base_open.png");
pic = QPixmap(":/cgal/Polyhedron_3/resources/prism-open.png");
dock_widget->prism_picLabel->setPixmap(pic);
dock_widget->prism_picLabel->show();
}
@ -297,16 +297,17 @@ void Basic_generator_plugin::generateCube()
points[i] = Point(coords[0], coords[1], coords[2]);
}
CGAL::make_hexahedron(points[0],
points[1],
points[2],
points[3],
CGAL::make_hexahedron(
points[3],
points[2],
points[1],
points[0],
points[4],
points[5],
points[6],
points[7],
cube);
points[5],
points[4],
points[7],
points[6],
cube);
}
else
{
@ -665,11 +666,12 @@ struct Point_generator
template<class Facegraph_item>
void Basic_generator_plugin::generateGrid()
{
typename Facegraph_item::Face_graph grid;
typedef typename Facegraph_item::Face_graph Face_graph;
Face_graph grid;
QString points_text;
Point extrema[2];
std::size_t nb_cells[2];
typename boost::graph_traits<Face_graph>::vertices_size_type nb_cells[2];
bool triangulated = dock_widget->grid_checkBox->isChecked();
points_text= dock_widget->grid_lineEdit->text();

View File

@ -31,7 +31,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap>:/cgal/icons/resources/base.png</pixmap>
<pixmap resource="../../Polyhedron_3.qrc">:/cgal/Polyhedron_3/resources/prism.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>

View File

@ -55,6 +55,8 @@
<file>resources/icosphere.png</file>
<file>resources/tetrahedron.png</file>
<file>resources/grid.png</file>
<file>resources/prism.png</file>
<file>resources/prism-open.png</file>
</qresource>
<qresource prefix="/cgal/cursors">
<file>resources/rotate_around_cursor.png</file>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB