33
33
#include " qgsapplication.h"
34
34
#include " qgsoptions.h"
35
35
#include " qgsguiutils.h"
36
+ #include " qgsvectorlayerjoininfo.h"
36
37
37
38
38
39
QgsAppScreenShots::QgsAppScreenShots ( const QString &saveDirectory )
39
40
: mSaveDirectory( saveDirectory )
40
41
{
41
- QString layerDef = QStringLiteral ( " Point?crs=epsg:4326&field=pk:integer&field=my_text:string&field=my_integer :integer&field=my_double:double&key=pk" );
42
+ QString layerDef = QStringLiteral ( " Point?crs=epsg:4326&field=pk:integer&field=my_text:string&field=fk_polygon :integer&field=my_double:double&key=pk" );
42
43
mLineLayer = new QgsVectorLayer ( layerDef, QStringLiteral ( " Line Layer" ), QStringLiteral ( " memory" ) );
43
44
layerDef = QStringLiteral ( " Polygon?crs=epsg:2056&field=pk:integer&field=my_text:string&field=my_integer:integer&field=height:double&key=pk" );
44
45
mPolygonLayer = new QgsVectorLayer ( layerDef, QStringLiteral ( " Polygon Layer" ), QStringLiteral ( " memory" ) );
45
46
47
+ QgsVectorLayerJoinInfo join;
48
+ join.setTargetFieldName ( " fk_polygon" );
49
+ join.setJoinLayer ( mPolygonLayer );
50
+ join.setJoinFieldName ( " pk" );
51
+ join.setUsingMemoryCache ( true );
52
+ join.setEditable ( true );
53
+ join.setCascadedDelete ( true );
54
+ mLineLayer ->addJoin ( join );
55
+
46
56
QgsProject::instance ()->addMapLayers ( QList<QgsMapLayer *>()
47
57
<< mLineLayer
48
58
<< mPolygonLayer );
@@ -195,8 +205,8 @@ void QgsAppScreenShots::takePicturesOf( Categories categories )
195
205
196
206
if ( !categories || categories.testFlag ( VectorLayerProperties ) )
197
207
{
198
- takeVectorLayerProperties ();
199
208
takeVectorLayerProperties25DSymbol ();
209
+ takeVectorLayerProperties ();
200
210
}
201
211
}
202
212
@@ -214,6 +224,7 @@ void QgsAppScreenShots::takeVectorLayerProperties()
214
224
QString folder = QLatin1String ( " working_with_vector/img/auto_generated/vector_layer_properties" );
215
225
QgsVectorLayerProperties *dlg = new QgsVectorLayerProperties ( mLineLayer , QgisApp::instance () );
216
226
dlg->show ();
227
+ dlg->mJoinTreeWidget ->expandAll (); // expand join tree
217
228
// ----------------
218
229
// do all the pages
219
230
for ( int row = 0 ; row < dlg->mOptionsListWidget ->count (); ++row )
0 commit comments