@@ -135,11 +135,11 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
135
135
connect ( sliderTransparency, SIGNAL ( valueChanged ( int ) ), this , SLOT ( sliderTransparency_valueChanged ( int ) ) );
136
136
137
137
// insert existing join info
138
- QList< QgsVectorJoinInfo > joins = layer->vectorJoins ();
139
- for ( int i = 0 ; i < joins.size (); ++i )
140
- {
141
- addJoinToTreeWidget ( joins[i] );
142
- }
138
+ QList< QgsVectorJoinInfo > joins = layer->vectorJoins ();
139
+ for ( int i = 0 ; i < joins.size (); ++i )
140
+ {
141
+ addJoinToTreeWidget ( joins[i] );
142
+ }
143
143
144
144
// for each overlay plugin create a new tab
145
145
int position;
@@ -803,41 +803,41 @@ QString QgsVectorLayerProperties::metadata()
803
803
804
804
QString xMin, yMin, xMax, yMax;
805
805
double changeoverValue = 99999 ; // The 'largest' 5 digit number
806
- if (fabs (myExtent.xMinimum ()) > changeoverValue)
807
- {
808
- xMin = QString (" %1" ).arg (myExtent.xMinimum (), 0 , ' f' , 2 );
809
- }
806
+ if ( fabs ( myExtent.xMinimum () ) > changeoverValue )
807
+ {
808
+ xMin = QString ( " %1" ).arg ( myExtent.xMinimum (), 0 , ' f' , 2 );
809
+ }
810
810
else
811
- {
812
- xMin = QString (" %1" ).arg (myExtent.xMinimum ());
813
- }
811
+ {
812
+ xMin = QString ( " %1" ).arg ( myExtent.xMinimum () );
813
+ }
814
814
815
- if (fabs (myExtent.yMinimum ()) > changeoverValue)
816
- {
817
- yMin = QString (" %1" ).arg (myExtent.yMinimum (), 0 , ' f' , 2 );
818
- }
815
+ if ( fabs ( myExtent.yMinimum () ) > changeoverValue )
816
+ {
817
+ yMin = QString ( " %1" ).arg ( myExtent.yMinimum (), 0 , ' f' , 2 );
818
+ }
819
819
else
820
- {
821
- yMin = QString (" %1" ).arg (myExtent.yMinimum ());
822
- }
820
+ {
821
+ yMin = QString ( " %1" ).arg ( myExtent.yMinimum () );
822
+ }
823
823
824
- if (fabs (myExtent.xMaximum ()) > changeoverValue)
825
- {
826
- xMax = QString (" %1" ).arg (myExtent.xMaximum (), 0 , ' f' , 2 );
827
- }
824
+ if ( fabs ( myExtent.xMaximum () ) > changeoverValue )
825
+ {
826
+ xMax = QString ( " %1" ).arg ( myExtent.xMaximum (), 0 , ' f' , 2 );
827
+ }
828
828
else
829
- {
830
- xMax = QString (" %1" ).arg (myExtent.xMaximum ());
831
- }
829
+ {
830
+ xMax = QString ( " %1" ).arg ( myExtent.xMaximum () );
831
+ }
832
832
833
- if (fabs (myExtent.yMaximum ()) > changeoverValue)
834
- {
835
- yMax = QString (" %1" ).arg (myExtent.yMaximum (), 0 , ' f' , 2 );
836
- }
833
+ if ( fabs ( myExtent.yMaximum () ) > changeoverValue )
834
+ {
835
+ yMax = QString ( " %1" ).arg ( myExtent.yMaximum (), 0 , ' f' , 2 );
836
+ }
837
837
else
838
- {
839
- yMax = QString (" %1" ).arg (myExtent.yMaximum ());
840
- }
838
+ {
839
+ yMax = QString ( " %1" ).arg ( myExtent.yMaximum () );
840
+ }
841
841
842
842
myMetadata += tr ( " In layer spatial reference system units : " )
843
843
+ tr ( " xMin,yMin %1,%2 : xMax,yMax %3,%4" )
@@ -1172,19 +1172,19 @@ void QgsVectorLayerProperties::setUsingNewSymbology( bool useNewSymbology )
1172
1172
void QgsVectorLayerProperties::on_mButtonAddJoin_clicked ()
1173
1173
{
1174
1174
QgsAddJoinDialog d ( layer );
1175
- if ( d.exec () == QDialog:: QDialog::Accepted )
1175
+ if ( d.exec () == QDialog::Accepted )
1176
1176
{
1177
1177
QgsVectorJoinInfo info;
1178
1178
info.targetField = d.targetField ();
1179
1179
info.joinLayerId = d.joinedLayerId ();
1180
1180
info.joinField = d.joinField ();
1181
- if ( layer )
1181
+ if ( layer )
1182
1182
{
1183
1183
// create attribute index if possible. Todo: ask user if this should be done (e.g. in QgsAddJoinDialog)
1184
- if ( d.createAttributeIndex () )
1184
+ if ( d.createAttributeIndex () )
1185
1185
{
1186
1186
QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance ()->mapLayer ( info.joinLayerId ) );
1187
- if ( joinLayer )
1187
+ if ( joinLayer )
1188
1188
{
1189
1189
joinLayer->dataProvider ()->createAttributeIndex ( info.joinField );
1190
1190
}
@@ -1202,7 +1202,7 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( QgsVectorJoinInfo& join )
1202
1202
QTreeWidgetItem* joinItem = new QTreeWidgetItem ();
1203
1203
1204
1204
QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance ()->mapLayer ( join.joinLayerId ) );
1205
- if ( !joinLayer )
1205
+ if ( !joinLayer )
1206
1206
{
1207
1207
return ;
1208
1208
}
@@ -1222,7 +1222,7 @@ void QgsVectorLayerProperties::addJoinToTreeWidget( QgsVectorJoinInfo& join )
1222
1222
void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked ()
1223
1223
{
1224
1224
QTreeWidgetItem* currentJoinItem = mJoinTreeWidget ->currentItem ();
1225
- if ( !layer || !currentJoinItem )
1225
+ if ( !layer || !currentJoinItem )
1226
1226
{
1227
1227
return ;
1228
1228
}
0 commit comments