mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-17 00:04:02 -04:00
missed some warnings and other minor updates
git-svn-id: http://svn.osgeo.org/qgis/trunk@12546 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
e863e7d596
commit
4351ab5a4f
@ -32,6 +32,6 @@ Unter diesem Reiter können Sie die Reihenfolge der geladenen WMS-Layer ändern.
|
|||||||
<a name="search">
|
<a name="search">
|
||||||
<h4>Serversuche</h4>
|
<h4>Serversuche</h4>
|
||||||
</a>
|
</a>
|
||||||
Unter diesem Reiter können Sie nach WMS-Servern suchen. Sie können Suchbegriff in einem Textfeld angeben, nachdem dann über den Knopf <label>Suche</label> gesucht wird.<p>
|
Unter diesem Reiter können Sie nach WMS-Servern suchen. Sie können einen Suchbegriff in einem Textfeld angeben, nachdem dann über den Knopf <label>Suche</label> gesucht wird.<p>
|
||||||
Um das Ergebnis anzuzeigen, wählen Sie einen Eintrag und klicken auf <label>Gewählte Zeile der WMS-Liste hinzufügen</label> und wechseln wieder zum Reiter <label>Server</label>.<p>
|
Um das Ergebnis anzuzeigen, wählen Sie einen Eintrag und klicken auf <label>Gewählte Zeile der WMS-Liste hinzufügen</label> und wechseln wieder zum Reiter <label>Server</label>.<p>
|
||||||
Sie können dann die Layerliste mit einem Klick auf den Knopf <label>Verbinden</label> erfragen.
|
Sie können dann die Layerliste mit einem Klick auf den Knopf <label>Verbinden</label> erfragen.
|
||||||
|
@ -5,3 +5,4 @@ RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') |
|
|||||||
EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat"
|
EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat"
|
||||||
|
|
||||||
egrep --color=always "$RE" -r . | egrep -v "$EX"
|
egrep --color=always "$RE" -r . | egrep -v "$EX"
|
||||||
|
egrep --color=always "$RE" resources/context_help/*-en_US
|
||||||
|
@ -426,3 +426,5 @@ compatibiliy:compatibility
|
|||||||
determin:determine
|
determin:determine
|
||||||
immediatelly:immediately
|
immediatelly:immediately
|
||||||
actully:actually
|
actully:actually
|
||||||
|
disolve:dissolve
|
||||||
|
furter:further
|
||||||
|
@ -493,10 +493,10 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
|
|||||||
++jt;
|
++jt;
|
||||||
}
|
}
|
||||||
QList<double> values;
|
QList<double> values;
|
||||||
if( !dissolveGeometry )
|
if ( !dissolveGeometry )
|
||||||
{
|
{
|
||||||
QgsDebugMsg( "no dissolved geometry - should not happen" );
|
QgsDebugMsg( "no dissolved geometry - should not happen" );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
dissolveGeometry = dissolveGeometry->convexHull();
|
dissolveGeometry = dissolveGeometry->convexHull();
|
||||||
values = simpleMeasure( dissolveGeometry );
|
values = simpleMeasure( dissolveGeometry );
|
||||||
@ -539,7 +539,7 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
|
|||||||
}
|
}
|
||||||
QList<double> values;
|
QList<double> values;
|
||||||
// QgsGeometry* tmpGeometry = 0;
|
// QgsGeometry* tmpGeometry = 0;
|
||||||
if( !dissolveGeometry )
|
if ( !dissolveGeometry )
|
||||||
{
|
{
|
||||||
QgsDebugMsg( "no dissolved geometry - should not happen" );
|
QgsDebugMsg( "no dissolved geometry - should not happen" );
|
||||||
return false;
|
return false;
|
||||||
@ -767,7 +767,7 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil
|
|||||||
|
|
||||||
QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), dp->fields(), outputType, &crs );
|
QgsVectorFileWriter vWriter( shapefileName, dp->encoding(), dp->fields(), outputType, &crs );
|
||||||
QgsFeature currentFeature;
|
QgsFeature currentFeature;
|
||||||
QgsGeometry* dissolveGeometry; //dissolve geometry (if dissolve enabled)
|
QgsGeometry *dissolveGeometry = 0; //dissolve geometry (if dissolve enabled)
|
||||||
|
|
||||||
//take only selection
|
//take only selection
|
||||||
if ( onlySelectedFeatures )
|
if ( onlySelectedFeatures )
|
||||||
@ -840,6 +840,11 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil
|
|||||||
if ( dissolve )
|
if ( dissolve )
|
||||||
{
|
{
|
||||||
QgsFeature dissolveFeature;
|
QgsFeature dissolveFeature;
|
||||||
|
if ( !dissolveGeometry )
|
||||||
|
{
|
||||||
|
QgsDebugMsg( "no dissolved geometry - should not happen" );
|
||||||
|
return false;
|
||||||
|
}
|
||||||
dissolveFeature.setGeometry( dissolveGeometry );
|
dissolveFeature.setGeometry( dissolveGeometry );
|
||||||
vWriter.addFeature( dissolveFeature );
|
vWriter.addFeature( dissolveFeature );
|
||||||
}
|
}
|
||||||
|
@ -253,7 +253,7 @@ void QgsComposerArrow::setStartMarker( const QString& svgPath )
|
|||||||
if ( !r.load( svgPath ) )
|
if ( !r.load( svgPath ) )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
mStartArrowHeadHeight = 0;
|
// mStartArrowHeadHeight = 0;
|
||||||
}
|
}
|
||||||
mStartMarkerFile = svgPath;
|
mStartMarkerFile = svgPath;
|
||||||
|
|
||||||
@ -269,7 +269,7 @@ void QgsComposerArrow::setEndMarker( const QString& svgPath )
|
|||||||
if ( !r.load( svgPath ) )
|
if ( !r.load( svgPath ) )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
mStopArrowHeadHeight = 0;
|
// mStopArrowHeadHeight = 0;
|
||||||
}
|
}
|
||||||
mEndMarkerFile = svgPath;
|
mEndMarkerFile = svgPath;
|
||||||
|
|
||||||
|
@ -292,7 +292,7 @@ QString QgsGrassProvider::storageType() const
|
|||||||
bool QgsGrassProvider::nextFeature( QgsFeature& feature )
|
bool QgsGrassProvider::nextFeature( QgsFeature& feature )
|
||||||
{
|
{
|
||||||
feature.setValid( false );
|
feature.setValid( false );
|
||||||
int cat, type, id;
|
int cat = -1, type = -1, id = -1;
|
||||||
unsigned char *wkb;
|
unsigned char *wkb;
|
||||||
int wkbsize;
|
int wkbsize;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user