sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

-Fixed Qt version problem in ui files (version should always be set to 3.1)

Browse Source 
-Added debug statements to qgsvectorlayer to track down the X11 draw/hang bug


git-svn-id: http://svn.osgeo.org/qgis/trunk@2055 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2004-09-29 05:36:53 +00:00
parent d2266be0ce
commit 5af62599b1
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qgssimadialogbase.ui
View File

@ -1,4 +1,4 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>QgsSiMaDialogBase</class>
<widget class="QDialog">
<property name="name">

2
src/qgsuvalmadialogbase.ui
View File

@ -1,4 +1,4 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>QgsUValMaDialogBase</class>
<widget class="QDialog">
<property name="name">

15
src/qgsvectorlayer.cpp
View File

@ -562,10 +562,16 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans
x = (double *) ptr;
ptr += sizeof(double);
y = (double *) ptr;
#ifdef QGISDEBUG
std::cout << "Transforming " << *x << "," << *y << " to ";
#endif
ptr += sizeof(double);
pt.setX(*x);
pt.setY(*y);
cXf->transform(&pt);
#ifdef QGISDEBUG
std::cout << pt.xToInt() << "," << pt.yToInt() << std::endl;
#endif
pa->setPoint(pdx++, pt.xToInt(), pt.yToInt());
}
if ( idx == 0 ) { // remember last outer ring point
@ -619,12 +625,15 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsCoordinateTrans
ptr += sizeof(double);
y = (double *) ptr;
ptr += sizeof(double);
// std::cout << "Transforming " << *x << "," << *y << " to ";
#ifdef QGISDEBUG
std::cout << "Transforming " << *x << "," << *y << " to ";
#endif
pt.setX(*x);
pt.setY(*y);
cXf->transform(&pt);
//std::cout << pt.xToInt() << "," << pt.yToInt() << std::endl;
#ifdef QGISDEBUG
std::cout << pt.xToInt() << "," << pt.yToInt() << std::endl;
#endif
pa->setPoint(jdx, pt.xToInt(), pt.yToInt());
}