songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for the header() function 

- I forgot half the work on that one.
This commit is contained in:
Maxime Gimeno 2016-01-12 10:30:06 +01:00
parent fa895f3333
commit 97ba0f33f4
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -1804,8 +1804,7 @@ QString MainWindow::get_polyhedron_stats()
QString str;
for(int i=0; i< classnames.size(); i++)
{
CGAL::Three::Scene_item::Header_data data;
items[i].at(0)->header(data);
CGAL::Three::Scene_item::Header_data data = items[i].at(0)->header();
int title = 0;
int titles_limit =0;
if(data.titles.size()>0)

5
Polyhedron/demo/Polyhedron/Scene_item.cpp
View File

@ -153,9 +153,10 @@ QOpenGLShaderProgram* CGAL::Three::Scene_item::getShaderProgram(int name, CGAL::
return viewer->getShaderProgram(name);
}
CGAL::Three::Scene_item::Header_data CGAL::Three::Scene_item::header()
CGAL::Three::Scene_item::Header_data CGAL::Three::Scene_item::header() const
{
CGAL::Three::Scene_item::Header_data data;
return data;
}
QString CGAL::Three::Scene_item::compute_stats(int )

4
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
View File

@ -1255,8 +1255,9 @@ QString Scene_polyhedron_item::compute_stats(int type)
return QString();
}
void Scene_polyhedron_item::header(Header_data &data)
CGAL::Three::Scene_item::Header_data Scene_polyhedron_item::header() const
{
CGAL::Three::Scene_item::Header_data data;
//categories
data.categories.append(std::pair<QString,int>(QString("Properties"),9));
data.categories.append(std::pair<QString,int>(QString("Edges"),6));
@ -1282,4 +1283,5 @@ void Scene_polyhedron_item::header(Header_data &data)
data.titles.append(QString("Minimum"));
data.titles.append(QString("Maximum"));
data.titles.append(QString("Average"));
return data;
}

2
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
View File

@ -45,7 +45,7 @@ public:
MEAN_ANGLE
};
QString compute_stats(int type);
void header(Header_data &);
CGAL::Three::Scene_item::Header_data header() const;
Scene_polyhedron_item();
// Scene_polyhedron_item(const Scene_polyhedron_item&);
Scene_polyhedron_item(const Polyhedron& p);

2
Three/include/CGAL/Three/Scene_item.h
View File

@ -259,7 +259,7 @@ public:
QList<QString> titles;
};
//!Returns a Header_data struct containing the header information.
virtual Header_data header();
virtual Header_data header()const;
//!Returns a QString containing the requested value for the the table in the statistics dialog
/*!
* Example :