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

More ->matrix() replaced

This commit is contained in:
Maxime Gimeno 2019-07-10 11:58:13 +02:00
parent e6e8d232cb
commit d21709d0bd
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItem.h
View File

@ -174,8 +174,8 @@ TriangulationGraphicsItem<T>::paintVertices(QPainter *painter)
Converter<Geom_traits> convert; Converter<Geom_traits> convert;
painter->setPen(vertices_pen); painter->setPen(vertices_pen);
QMatrix matrix = painter->matrix(); QTransform matrix = painter->worldTransform();
painter->resetMatrix(); painter->resetTransform();
for(typename T::All_vertices_iterator it = t->all_vertices_begin(); for(typename T::All_vertices_iterator it = t->all_vertices_begin();
it != t->all_vertices_end(); it != t->all_vertices_end();
it++){ it++){
@ -191,10 +191,10 @@ TriangulationGraphicsItem<T>::paintVertex(typename T::Vertex_handle vh)
{ {
Converter<Geom_traits> convert; Converter<Geom_traits> convert;
m_painter->setPen(vertices_pen); m_painter->setPen(vertices_pen);
QMatrix matrix = m_painter->matrix(); QTransform matrix = m_painter->worldTransform();
m_painter->resetMatrix(); m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(t->point(vh)))); m_painter->drawPoint(matrix.map(convert(t->point(vh))));
m_painter->setMatrix(matrix); m_painter->setWorldTransform(matrix);
} }
template <typename T> template <typename T>

16
Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItemWithColorInfo.h
View File

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

16
Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/include/internal/Qt/TriangulationGraphicsItem.h
View File

@ -365,10 +365,10 @@ TriangulationGraphicsItem<T>::paintVertices(QPainter *painter)
Converter<Geom_traits> convert; Converter<Geom_traits> convert;
painter->setPen(verticesPen()); painter->setPen(verticesPen());
QMatrix matrix = painter->matrix(); QTransform matrix = painter->worldTransform();
//QMatrix tr(1, 0, 0, -1, 0, 0); //QMatrix tr(1, 0, 0, -1, 0, 0);
//matrix = tr*matrix; //matrix = tr*matrix;
painter->resetMatrix(); painter->resetTransform();
QPen temp = painter->pen(); QPen temp = painter->pen();
QPen old = temp; QPen old = temp;
@ -455,10 +455,10 @@ TriangulationGraphicsItem<T>::paintOneVertex(const typename T::Point& point)
Converter<Geom_traits> convert; Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen()); m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix(); QTransform matrix = m_painter->worldTransform();
m_painter->resetMatrix(); m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(point))); m_painter->drawPoint(matrix.map(convert(point)));
m_painter->setMatrix(matrix); m_painter->setWorldTransform(matrix);
} }
template <typename T> template <typename T>
@ -468,10 +468,10 @@ TriangulationGraphicsItem<T>::paintVertex(typename T::Vertex_handle vh)
Converter<Geom_traits> convert; Converter<Geom_traits> convert;
m_painter->setPen(this->verticesPen()); m_painter->setPen(this->verticesPen());
QMatrix matrix = m_painter->matrix(); QTransform matrix = m_painter->worldTransform();
m_painter->resetMatrix(); m_painter->resetTransform();
m_painter->drawPoint(matrix.map(convert(vh->point()))); m_painter->drawPoint(matrix.map(convert(vh->point())));
m_painter->setMatrix(matrix); m_painter->setWorldTransform(matrix);
} }
template <typename T> template <typename T>