Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
fix pedantic warnings
- Loading branch information
|
@@ -88,16 +88,14 @@ namespace pal |
|
|
void setDistLabel( double dist ) { distlabel = dist; } |
|
|
|
|
|
protected: |
|
|
Layer *layer; |
|
|
PalGeometry *userGeom; |
|
|
double label_x; |
|
|
double label_y; |
|
|
double distlabel; |
|
|
LabelInfo* labelInfo; // optional |
|
|
|
|
|
char *uid; |
|
|
Layer *layer; |
|
|
|
|
|
double distlabel; |
|
|
|
|
|
PalGeometry *userGeom; |
|
|
|
|
|
// array of parts - possibly not necessary |
|
|
//int nPart; |
|
|
|
@@ -98,13 +98,12 @@ namespace pal |
|
|
double min_scale; |
|
|
double max_scale; |
|
|
|
|
|
Arrangement arrangement; |
|
|
|
|
|
LabelMode mode; |
|
|
bool mergeLines; |
|
|
|
|
|
/** optional flags used for some placement methods */ |
|
|
unsigned long arrangementFlags; |
|
|
LabelMode mode; |
|
|
Arrangement arrangement; |
|
|
|
|
|
// indexes (spatial and id) |
|
|
RTree<FeaturePart*, double, 2, double, 8, 4> *rtree; |
|
|
|
@@ -106,8 +106,8 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath, |
|
|
mLabel( 0 ), |
|
|
mLabelOn( false ), |
|
|
mVertexMarkerOnlyForSelection( false ), |
|
|
mFetching( false ), |
|
|
mActiveCommand( NULL ), |
|
|
mFetching( false ), |
|
|
mRendererV2( NULL ), |
|
|
mUsingRendererV2( false ), |
|
|
mLabelingEngine( NULL ) |
|
|
|
@@ -732,6 +732,8 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer |
|
|
/** Geometry type as defined in enum WkbType (qgis.h) */ |
|
|
int mWkbType; |
|
|
|
|
|
QgsUndoCommand * mActiveCommand; |
|
|
|
|
|
/** Renderer object which holds the information about how to display the features */ |
|
|
QgsRenderer *mRenderer; |
|
|
|
|
@@ -778,8 +780,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer |
|
|
QSet<int> mFetchConsidered; |
|
|
QgsGeometryMap::iterator mFetchChangedGeomIt; |
|
|
QgsFeatureList::iterator mFetchAddedFeaturesIt; |
|
|
|
|
|
QgsUndoCommand * mActiveCommand; |
|
|
}; |
|
|
|
|
|
#endif |
|
@@ -89,8 +89,8 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2 |
|
|
void setSourceColorRamp( QgsVectorColorRampV2* ramp ); |
|
|
|
|
|
protected: |
|
|
QgsCategoryList mCategories; |
|
|
QString mAttrName; |
|
|
QgsCategoryList mCategories; |
|
|
QgsSymbolV2* mSourceSymbol; |
|
|
QgsVectorColorRampV2* mSourceColorRamp; |
|
|
|
|
|
|
@@ -97,8 +97,8 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 |
|
|
void setSourceColorRamp( QgsVectorColorRampV2* ramp ); |
|
|
|
|
|
protected: |
|
|
QgsRangeList mRanges; |
|
|
QString mAttrName; |
|
|
QgsRangeList mRanges; |
|
|
Mode mMode; |
|
|
QgsSymbolV2* mSourceSymbol; |
|
|
QgsVectorColorRampV2* mSourceColorRamp; |
|
|
|
@@ -101,9 +101,10 @@ QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2::clone() const |
|
|
class MyLine |
|
|
{ |
|
|
public: |
|
|
MyLine( QPointF p1, QPointF p2 ) |
|
|
MyLine( QPointF p1, QPointF p2 ) : mVertical(false), mIncreasing(false), mT(0.0), mLength(0.0) |
|
|
{ |
|
|
if ( p1 == p2 ) return; // invalid |
|
|
if ( p1 == p2 ) |
|
|
return; // invalid |
|
|
|
|
|
// tangent and direction |
|
|
if ( p1.x() == p2.x() ) |
|
|
|
@@ -269,7 +269,7 @@ QPolygonF offsetLine( QPolygonF polyline, double dist ) |
|
|
if ( polyline.count() < 2 ) |
|
|
return newLine; |
|
|
|
|
|
double angle, t_new, t_old = 0; |
|
|
double angle = 0.0, t_new, t_old = 0; |
|
|
QPointF pt_old, pt_new; |
|
|
QPointF p1 = polyline[0], p2; |
|
|
|
|
|
|
@@ -148,7 +148,7 @@ LabelingGui::LabelingGui( PalLabeling* lbl, QgsVectorLayer* layer, QWidget* pare |
|
|
radLineParallel, radLineCurved, radLineHorizontal, // line |
|
|
radAroundCentroid, radPolygonHorizontal, radPolygonFree, radPolygonPerimeter // polygon |
|
|
}; |
|
|
for ( int i = 0; i < sizeof( placementRadios ) / sizeof( QRadioButton* ); i++ ) |
|
|
for ( unsigned int i = 0; i < sizeof( placementRadios ) / sizeof( QRadioButton* ); i++ ) |
|
|
connect( placementRadios[i], SIGNAL( toggled( bool ) ), this, SLOT( updateOptions() ) ); |
|
|
} |
|
|
|
|
|
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session.
You signed out in another tab or window. Reload to refresh your session.