Skip to content

Commit aa33be6

Browse files
author
jef
committedMay 8, 2010
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13438 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent deb993d commit aa33be6

14 files changed

+62
-6898
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ qgis (1.5.0) UNRELEASED; urgency=low
88
libgdal1-$VERSION-grass
99
* add spatialquery plugin
1010
* include qgis.g.browser in grass plugin
11+
* drop symbol tracking, C++ ABIs change too frequently
1112

12-
-- Jürgen E. Fischer <jef@norbit.de> Fri, 07 May 2010 13:11:22 +0200
13+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 08 May 2010 13:26:13 +0200
1314

1415
qgis (1.4.0) UNRELEASED; urgency=low
1516

‎debian/libqgis{QGIS_ABI}.symbols

Lines changed: 0 additions & 6828 deletions
This file was deleted.

‎scripts/spelling.dat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ logile:logfile
284284
protecion:protection
285285
aritmetic:arithmetic
286286
futhermore:furthermore
287+
futher:further
287288
initializiation:initialization
288289
pronouce:pronounce
289290
expecially:especially

‎src/app/qgisapp.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,12 @@
154154
#include "qgsattributetabledialog.h"
155155
#include "qgsvectorfilewriter.h"
156156
#include "qgscredentialdialog.h"
157-
#include "qgsnetworkproxyfactory.h"
158157
#include "qgstilescalewidget.h"
159158

159+
#if QT_VERSION >= 0x40500
160+
#include "qgsnetworkproxyfactory.h"
161+
#endif
162+
160163
#ifdef HAVE_QWT
161164
#include "qgsgpsinformationwidget.h"
162165
#endif
@@ -362,9 +365,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
362365
, mPythonUtils( NULL )
363366
, mNAM( NULL )
364367
, mpTileScaleWidget( NULL )
365-
#if QT_VERSION >= 0x40500
366-
, mProxyFactory( NULL )
367-
#endif
368368
#ifdef HAVE_QWT
369369
, mpGpsWidget( NULL )
370370
#endif
@@ -6627,13 +6627,16 @@ void QgisApp::namUpdate()
66276627
}
66286628

66296629
#if QT_VERSION >= 0x40500
6630-
if ( !mProxyFactory )
6630+
if( !mNAM->proxyFactory() )
66316631
{
6632-
mProxyFactory = new QgsNetworkProxyFactory();
6633-
mNAM->setProxyFactory( mProxyFactory );
6634-
}
6632+
mNAM->setProxyFactory( new QgsNetworkProxyFactory() );
6633+
}
66356634

6636-
mProxyFactory->setProxyAndExcludes( proxy, excludes );
6635+
QgsNetworkProxyFactory *pf = dynamic_cast<QgsNetworkProxyFactory *>( mNAM->proxyFactory() );
6636+
if( pf )
6637+
{
6638+
pf->setProxyAndExcludes( proxy, excludes );
6639+
}
66376640

66386641
QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( nam()->cache() );
66396642
if ( !cache )

‎src/app/qgisapp.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ class QgsGPSInformationWidget;
8080
#include "qgsfeature.h"
8181
#include "qgspoint.h"
8282

83-
#if QT_VERSION >= 0x40500
84-
class QgsNetworkProxyFactory;
85-
#endif
86-
8783
/*! \class QgisApp
8884
* \brief Main window for the Qgis application
8985
*/
@@ -1100,10 +1096,6 @@ class QgisApp : public QMainWindow
11001096
//! Persistent tile scale slider
11011097
QgsTileScaleWidget * mpTileScaleWidget;
11021098

1103-
#if QT_VERSION >= 0x40500
1104-
QgsNetworkProxyFactory *mProxyFactory;
1105-
#endif
1106-
11071099
int mLastComposerId;
11081100

11091101
#ifdef HAVE_QWT

‎src/app/qgsmaptoolannotation.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <QDialog>
2626
#include <QMouseEvent>
2727

28-
QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ), \
28+
QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ): QgsMapTool( canvas ),
2929
mActiveItem( 0 ), mCurrentMoveAction( QgsAnnotationItem::NoAction ), mLastMousePosition( 0, 0 )
3030
{
3131
mCursor = QCursor( Qt::ArrowCursor );
@@ -158,26 +158,26 @@ void QgsMapToolAnnotation::canvasMoveEvent( QMouseEvent * e )
158158
double xmax = xmin + size.width();
159159
double ymax = ymin + size.height();
160160

161-
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight || \
162-
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown || \
161+
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRight ||
162+
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown ||
163163
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
164164
{
165165
xmax += e->posF().x() - mLastMousePosition.x();
166166
}
167-
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft || \
168-
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
167+
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeft ||
168+
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
169169
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp )
170170
{
171171
xmin += e->posF().x() - mLastMousePosition.x();
172172
}
173-
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp || \
174-
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp || \
173+
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameUp ||
174+
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftUp ||
175175
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightUp )
176176
{
177177
ymin += e->posF().y() - mLastMousePosition.y();
178178
}
179-
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown || \
180-
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown || \
179+
if ( mCurrentMoveAction == QgsAnnotationItem::ResizeFrameDown ||
180+
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameLeftDown ||
181181
mCurrentMoveAction == QgsAnnotationItem::ResizeFrameRightDown )
182182
{
183183
ymax += e->posF().y() - mLastMousePosition.y();

‎src/app/qgsmaptoolrotatepointsymbols.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <QMessageBox>
2525
#include <QMouseEvent>
2626

27-
QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), \
28-
mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ), \
27+
QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ),
28+
mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ),
2929
mRotating( false ), mRotationItem( 0 ), mCtrlPressed( false )
3030
{
3131

‎src/app/qgsmaptoolsimplify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ bool QgsMapToolSimplify::calculateSliderBoudaries()
166166
{
167167
count++;
168168
if ( count == 30 && !maximized )
169-
{ //special case when tolerance is tool low to be correct so it's similat to 0
169+
{ //special case when tolerance is too low to be correct so it's near 0
170170
// else in some special cases this algorithm would create infinite loop
171171
found = true;
172172
minTolerance = 0;

‎src/app/qgsnetworkproxyfactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ QList<QNetworkProxy> QgsNetworkProxyFactory::queryProxy( const QNetworkProxyQuer
5757
}
5858

5959
QgsDebugMsg( QString("using user proxy for %1").arg( url ) );
60-
return QList<QNetworkProxy>() << mProxy;
60+
return QList<QNetworkProxy>() << mProxy;
6161
}
6262

6363
#endif // QT_VERSION >= 0x40500

‎src/app/qgsnetworkproxyfactory.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818
#ifndef QGSNETWORKPROXYFACTORY_H
1919
#define QGSNETWORKPROXYFACTORY_H
2020

21-
#if QT_VERSION >= 0x40500
22-
2321
#include <QNetworkProxyFactory>
2422
#include <QStringList>
2523

26-
class QgsNetworkProxyFactory : public QNetworkProxyFactory
24+
class QgsNetworkProxyFactory : public QObject, public QNetworkProxyFactory
2725
{
2826
public:
2927
QgsNetworkProxyFactory();
@@ -37,6 +35,4 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
3735
QNetworkProxy mProxy;
3836
};
3937

40-
#endif // QT_VERSION >= 0x40500
41-
4238
#endif

‎src/plugins/grass/qtermwidget/TerminalDisplay.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2423,6 +2423,8 @@ QVariant TerminalDisplay::inputMethodQuery( Qt::InputMethodQuery query ) const
24232423
case Qt::ImCurrentSelection:
24242424
return QString();
24252425
break;
2426+
default:
2427+
break;
24262428
}
24272429

24282430
return QVariant();

‎src/plugins/spatialquery/qgsspatialquerydialog.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ void QgsSpatialQueryDialog::runQuery()
190190
buttonBox->button( QDialogButtonBox::Close )->show();
191191
buttonBox->button( QDialogButtonBox::Cancel )->hide();
192192
buttonBox->button( QDialogButtonBox::Ok )->hide();
193+
adjustSize();
193194
} // void QgsSpatialQueryDialog::runQuery()
194195

195196
void QgsSpatialQueryDialog::setInputsVisible( bool show )
@@ -586,8 +587,17 @@ void QgsSpatialQueryDialog::on_buttonBox_accepted()
586587

587588
void QgsSpatialQueryDialog::on_buttonBox_rejected()
588589
{
589-
reject();
590-
590+
if ( grpResults->isHidden() )
591+
reject();
592+
else
593+
{
594+
grpResults->hide();
595+
setInputsVisible( true );
596+
progressBarStatus->show();
597+
buttonBox->button( QDialogButtonBox::Close )->hide();
598+
buttonBox->button( QDialogButtonBox::Cancel )->show();
599+
buttonBox->button( QDialogButtonBox::Ok )->show();
600+
}
591601
} // void QgsSpatialQueryDialog::on_buttonBox_rejected()
592602

593603
void QgsSpatialQueryDialog::on_targetLayerComboBox_currentIndexChanged( int index )

‎src/plugins/spatialquery/qgsspatialquerydialogbase.ui

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -315,22 +315,4 @@ p, li { white-space: pre-wrap; }
315315
</layout>
316316
</widget>
317317
<resources/>
318-
<connections>
319-
<connection>
320-
<sender>buttonBox</sender>
321-
<signal>rejected()</signal>
322-
<receiver>QgsSpatialQueryDialogBase</receiver>
323-
<slot>reject()</slot>
324-
<hints>
325-
<hint type="sourcelabel">
326-
<x>288</x>
327-
<y>438</y>
328-
</hint>
329-
<hint type="destinationlabel">
330-
<x>292</x>
331-
<y>459</y>
332-
</hint>
333-
</hints>
334-
</connection>
335-
</connections>
336318
</ui>

‎src/providers/wms/qgswmsprovider.cpp

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,6 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
571571
}
572572

573573
double tres = mResolutions[i];
574-
double dx = mTileWidth * tres;
575-
double dy = mTileHeight * tres;
576574

577575
// clip view extent to layer extent
578576
double xmin = std::max( viewExtent.xMinimum(), layerExtent.xMinimum() );
@@ -581,12 +579,12 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
581579
double ymax = std::min( viewExtent.yMaximum(), layerExtent.yMaximum() );
582580

583581
// snap to tile coordinates
584-
double x0 = floor(( xmin - layerExtent.xMinimum() ) / dx ) * dx + layerExtent.xMinimum();
585-
double y0 = floor(( ymin - layerExtent.yMinimum() ) / dy ) * dy + layerExtent.yMinimum();
582+
double x0 = floor(( xmin - layerExtent.xMinimum() ) / mTileWidth / tres ) * mTileWidth * tres + layerExtent.xMinimum();
583+
double y0 = floor(( ymin - layerExtent.yMinimum() ) / mTileHeight / tres ) * mTileHeight * tres + layerExtent.yMinimum();
586584

587585
#ifdef QGISDEBUG
588586
// calculate number of tiles
589-
int n = ceil(( xmax - xmin ) / dx ) * ceil(( ymax - ymin ) / dy );
587+
int n = ceil(( xmax - xmin ) / mTileWidth / tres ) * ceil(( ymax - ymin ) / mTileHeight / tres );
590588
#endif
591589

592590
QgsDebugMsg( QString( "layer extent: %1,%2 %3x%4" )
@@ -604,13 +602,13 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
604602
);
605603
QgsDebugMsg( QString( "tile extent: %1,%2 %3x%4 pixel:%5x%6 res:%7" )
606604
.arg( x0, 0, 'f' ).arg( y0, 0, 'f' )
607-
.arg( dx, 0, 'f' ).arg( dy, 0, 'f' )
605+
.arg( mTileWidth * tres, 0, 'f' ).arg( mTileHeight * tres, 0, 'f' )
608606
.arg( mTileWidth ).arg( mTileHeight )
609607
.arg( tres, 0, 'f' )
610608
);
611609
QgsDebugMsg( QString( "tile number: %1x%2 = %3" )
612-
.arg( ceil(( xmax - xmin ) / dx ) )
613-
.arg( ceil(( ymax - ymin ) / dy ) )
610+
.arg( ceil(( xmax - xmin ) / mTileWidth / tres ) )
611+
.arg( ceil(( ymax - ymin ) / mTileHeight / tres ) )
614612
.arg( n )
615613
);
616614

@@ -635,33 +633,40 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
635633
urlargs += QString( "&FORMAT=%1" ).arg( imageMimeType );
636634
urlargs += QString( "&TILED=true" );
637635

636+
i = 0;
638637
int j = 0;
639-
for ( double y = y0; y < ymax; y += dy )
638+
double y = y0;
639+
while ( y < ymax )
640640
{
641-
for ( double x = x0; x <= xmax; x += dx )
641+
int k = 0;
642+
double x = x0;
643+
while ( x < xmax )
642644
{
643645
QString turl;
644646
turl += url;
645647
turl += QString( changeXY ? "&BBOX=%2,%1,%4,%3" : "&BBOX=%1,%2,%3,%4" )
646648
.arg( x, 0, 'f' )
647649
.arg( y, 0, 'f' )
648-
.arg( x + dx, 0, 'f' )
649-
.arg( y + dy, 0, 'f' );
650+
.arg( x + mTileWidth * tres, 0, 'f' )
651+
.arg( y + mTileHeight * tres, 0, 'f' );
650652
turl += urlargs;
651653

652654
QNetworkRequest request( turl );
653-
QgsDebugMsg( QString( "tileRequest %1 %2/%3: %4" ).arg( mTileReqNo ).arg( j++ ).arg( n ).arg( turl ) );
655+
QgsDebugMsg( QString( "tileRequest %1 %2/%3: %4" ).arg( mTileReqNo ).arg( i++ ).arg( n ).arg( turl ) );
654656
request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache );
655657
request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
656658
request.setAttribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 0 ), mTileReqNo );
657659
request.setAttribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 1 ), j );
658-
request.setAttribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 2 ), QRectF( x, y, dx, dy ) );
660+
request.setAttribute( static_cast<QNetworkRequest::Attribute>( QNetworkRequest::User + 2 ), QRectF( x, y, mTileWidth * tres, mTileHeight * tres ) );
659661

660662
QgsDebugMsg( QString( "gettile: %1" ).arg( turl ) );
661663
QNetworkReply *reply = smNAM->get( request );
662664
tileReplies << reply;
663665
connect( reply, SIGNAL( finished() ), this, SLOT( tileReplyFinished() ) );
666+
667+
x = x0 + k++*mTileWidth * tres;
664668
}
669+
y = y0 + j++*mTileHeight * tres;
665670
}
666671

667672
mWaiting = true;

0 commit comments

Comments
 (0)
Please sign in to comment.