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

Replace matrix with worldTransform

This commit is contained in:
Maxime Gimeno 2019-07-08 14:05:42 +02:00
parent 6cff0987ad
commit 243c7b1c75
16 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GraphicsView/demo/Circular_kernel_2/ArcsGraphicsItem.h
View File

@ -116,10 +116,10 @@ ArcsGraphicsItem<CK>::paint(QPainter *painter,
Line_arc_2 la;
if(assign(cap_ui, *it)){
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
painter->drawPoint(matrix.map(convert(cap_ui.first)));
painter->setMatrix(matrix);
painter->setWorldTransform(matrix);
}if(assign(ca, *it)){
painterostream << ca;
} else if(assign(la, *it)){

24
GraphicsView/demo/Periodic_2_triangulation_2/include/CGAL/Qt/PeriodicTriangulationGraphicsItem.h
View File

@ -223,8 +223,8 @@ namespace CGAL {
Converter<Geom_traits> convert;
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
{ // Faces
painter->setPen(QPen());
@ -254,7 +254,7 @@ namespace CGAL {
}
}
painter->setMatrix(matrix);
painter->setWorldTransform(matrix);
}
if(visibleEdges()) {
@ -272,8 +272,8 @@ namespace CGAL {
if(visibleVertices()) {
Converter<Geom_traits> convert;
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
QPen pen = verticesPen();
if (t->number_of_vertices() < 8) {
@ -301,7 +301,7 @@ namespace CGAL {
}
}
painter->setMatrix(matrix);
painter->setWorldTransform(matrix);
}
}
@ -312,10 +312,10 @@ namespace CGAL {
Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(point)));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>
@ -325,10 +325,10 @@ namespace CGAL {
Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(vh->point())));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>

16
GraphicsView/include/CGAL/Qt/AlphaShapeGraphicsItem.h
View File

@ -242,8 +242,8 @@ AlphaShapeGraphicsItem<T>::paintVertices(QPainter *painter)
Converter<Geom_traits> convert;
painter->setPen(verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename T::Finite_vertices_iterator it = t->finite_vertices_begin();
it != t->finite_vertices_end();
it++){
@ -260,10 +260,10 @@ AlphaShapeGraphicsItem<T>::paintOneVertex(const typename T::Point& point)
Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(point)));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>
@ -273,10 +273,10 @@ AlphaShapeGraphicsItem<T>::paintVertex(typename T::Vertex_handle vh)
Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(vh->point())));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>

6
GraphicsView/include/CGAL/Qt/DelaunayMeshTriangulationGraphicsItem.h
View File

@ -265,14 +265,14 @@ DelaunayMeshTriangulationGraphicsItem<T>::paintSeeds(QPainter *painter)
{
Converter<Geom_traits> convert;
painter->setPen(this->seedsPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
typename std::list<Point>::iterator sit;
for(sit = seeds_begin; sit != seeds_end; ++sit)
painter->drawPoint(matrix.map(convert(*sit)));
painter->setMatrix(matrix);
painter->setWorldTransform(matrix);
}
}

4
GraphicsView/include/CGAL/Qt/PointsGraphicsItem.h
View File

@ -124,8 +124,8 @@ PointsGraphicsItem<P>::paint(QPainter *painter,
Converter<Traits> convert;
painter->setPen(verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename P::iterator it = points->begin();
it != points->end();
it++){

4
GraphicsView/include/CGAL/Qt/PointsInKdTreeGraphicsItem.h
View File

@ -160,8 +160,8 @@ PointsInKdTreeGraphicsItem<KdTree>::paint(QPainter *painter,
Iso_rectangle_2 isor = convert(option->exposedRect);
Fuzzy_iso_box range(isor.vertex(0), isor.vertex(2));
painter->setPen(verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
Draw<Traits> draw(painter, &matrix);
kdtree->search(draw, range);
}

4
GraphicsView/include/CGAL/Qt/PolygonGraphicsItem.h
View File

@ -154,8 +154,8 @@ PolygonGraphicsItem<P>::paint(QPainter *painter,
Converter<Traits> convert;
painter->setPen(verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename P::Vertex_iterator it = poly->vertices_begin();
it != poly->vertices_end();
it++){

4
GraphicsView/include/CGAL/Qt/PolygonWithHolesGraphicsItem.h
View File

@ -181,8 +181,8 @@ PolygonWithHolesGraphicsItem<P>::paint(QPainter *painter,
if(drawVertices()) {
painter->setPen(verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename P::General_polygon_2::Vertex_iterator it = poly->outer_boundary().vertices_begin();
it != poly->outer_boundary().vertices_end();
it++){

4
GraphicsView/include/CGAL/Qt/RegularGridGraphicsItem.h
View File

@ -180,8 +180,8 @@ void
/*
painter->setPen(this->verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(int i = 0; i < nw; i++){
for(int j = 0; j < nh; j++){
painter->drawPoint(matrix.map(QPointF(i*dw, j*dh)));

4
GraphicsView/include/CGAL/Qt/RegularGridVectorFieldGraphicsItem.h
View File

@ -163,8 +163,8 @@ void
}
}
painter->setPen(this->verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(int i = 0; i < nw; i++){
for(int j = 0; j < nh; j++){
painter->drawPoint(matrix.map(QPointF(i*dw, j*dh)));

10
GraphicsView/include/CGAL/Qt/RegularTriangulationGraphicsItem.h
View File

@ -209,8 +209,8 @@ RegularTriangulationGraphicsItem<T>::paintVertices(QPainter *painter)
}
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename T::Finite_vertices_iterator it = t->finite_vertices_begin();
it != t->finite_vertices_end();
it++){
@ -228,10 +228,10 @@ RegularTriangulationGraphicsItem<T>::paintOneVertex(const typename T::Point& poi
typename T::Bare_point p = t->geom_traits().construct_point_2_object()(point);
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(p)));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>

4
GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphGraphicsItem.h
View File

@ -165,8 +165,8 @@ SegmentDelaunayGraphGraphicsItem<T>::drawAll(QPainter *painter, const QStyleOpti
}
{
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
Converter<Kern> convert;
typename T::Finite_vertices_iterator vit;
for (vit = t->finite_vertices_begin();

4
GraphicsView/include/CGAL/Qt/SegmentDelaunayGraphLinfGraphicsItem.h
View File

@ -200,8 +200,8 @@ SegmentDelaunayGraphLinfGraphicsItem<T>::drawAll(QPainter *painter, const QStyle
}
{
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
Converter<Kern> convert;
typename T::Finite_vertices_iterator vit;
for (vit = t->finite_vertices_begin();

16
GraphicsView/include/CGAL/Qt/TriangulationGraphicsItem.h
View File

@ -197,8 +197,8 @@ TriangulationGraphicsItem<T>::paintVertices(QPainter *painter)
Converter<Geom_traits> convert;
painter->setPen(verticesPen());
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename T::Finite_vertices_iterator it = t->finite_vertices_begin();
it != t->finite_vertices_end();
it++){
@ -215,10 +215,10 @@ TriangulationGraphicsItem<T>::paintOneVertex(const typename T::Point& point)
Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(point)));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>
@ -228,10 +228,10 @@ TriangulationGraphicsItem<T>::paintVertex(typename T::Vertex_handle vh)
Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix();
m_painter->resetMatrix();
QTransform matrix = m_painter->worldTransform();
m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(vh->point())));
m_painter->setMatrix(matrix);
m_painter->setWorldTransform(matrix);
}
template <typename T>

10
Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
View File

@ -175,10 +175,10 @@ PolylineSimplificationGraphicsItem<PCT>::paintVertex( typename PCT::Vertex_handl
// } else {
this->m_painter->setPen(this->verticesPen());
// }
QMatrix matrix = this->m_painter->matrix();
this->m_painter->resetMatrix();
QTransform matrix = this->m_painter->worldTransform();
this->m_painter->resetTransform();
this->m_painter->drawPoint(matrix.map(convert(vh->point())));
this->m_painter->setMatrix(matrix);
this->m_painter->setWorldTransform(matrix);
}
@ -190,8 +190,8 @@ PolylineSimplificationGraphicsItem<PCT>::paintVertices(QPainter *painter)
{
Converter<Geom_traits> convert;
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(Constraint_iterator cit = this->t->constraints_begin();
cit != this->t->constraints_end();
++cit){

10
Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/TriangulationArrangementGraphicsItem.h
View File

@ -154,10 +154,10 @@ TriangulationArrangementGraphicsItem<T>::paintVertex(typename T::Vertex_handle v
} else {
this->m_painter->setPen(this->verticesPen());
}
QMatrix matrix = this->m_painter->matrix();
this->m_painter->resetMatrix();
QTransform matrix = this->m_painter->worldTransform();
this->m_painter->resetTransform();
this->m_painter->drawPoint(matrix.map(convert(vh->point())));
this->m_painter->setMatrix(matrix);
this->m_painter->setWorldTransform(matrix);
}
}
@ -170,8 +170,8 @@ TriangulationArrangementGraphicsItem<T>::paintVertices(QPainter *painter)
{
Converter<Geom_traits> convert;
QMatrix matrix = painter->matrix();
painter->resetMatrix();
QTransform matrix = painter->worldTransform();
painter->resetTransform();
for(typename T::Finite_vertices_iterator it = this->t->finite_vertices_begin();
it != this->t->finite_vertices_end();
it++)