sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restore HTML item atlas functionality

Browse Source
This commit is contained in:
Nyall Dawson 2017-12-23 15:22:30 +10:00
parent 8072d4d357
commit fee1c211a6
3 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/layout/qgslayouthtmlwidget.cpp
View File

@ -352,14 +352,11 @@ void QgsLayoutHtmlWidget::mInsertExpressionButton_clicked()
mHtmlEditor->getCursorPosition( &line, &index );
}
#if 0 //TODO
// use the atlas coverage layer, if any
QgsVectorLayer *coverageLayer = atlasCoverageLayer();
#endif
QgsVectorLayer *coverageLayer = nullptr;
QgsVectorLayer *layer = coverageLayer();
QgsExpressionContext context = mHtml->createExpressionContext();
QgsExpressionBuilderDialog exprDlg( coverageLayer, selText, this, QStringLiteral( "generic" ), context );
QgsExpressionBuilderDialog exprDlg( layer, selText, this, QStringLiteral( "generic" ), context );
exprDlg.setWindowTitle( tr( "Insert Expression" ) );
if ( exprDlg.exec() == QDialog::Accepted )
{

53
src/core/layout/qgslayoutitemhtml.cpp
View File

@ -28,6 +28,7 @@
#include "qgsmapsettings.h"
#include "qgswebpage.h"
#include "qgswebframe.h"
#include "qgslayoutitemmap.h"
#include <QCoreApplication>
#include <QPainter>
@ -50,23 +51,11 @@ QgsLayoutItemHtml::QgsLayoutItemHtml( QgsLayout *layout )
mWebPage->setNetworkAccessManager( QgsNetworkAccessManager::instance() );
#if 0 //TODO
if ( mLayout )
{
connect( mLayout, &QgsComposition::itemRemoved, this, &QgsComposerMultiFrame::handleFrameRemoval );
}
//a html item added to a layout needs to have the initial expression context set,
//otherwise fields in the html aren't correctly evaluated until atlas preview feature changes (#9457)
setExpressionContext( mLayout->context().feature(), mLayout->context().layer() );
if ( mComposition && mComposition->atlasMode() == QgsComposition::PreviewAtlas )
{
//a html item added while atlas preview is enabled needs to have the expression context set,
//otherwise fields in the html aren't correctly evaluated until atlas preview feature changes (#9457)
setExpressionContext( mComposition->atlasComposition().feature(), mComposition->atlasComposition().coverageLayer() );
}
//connect to atlas feature changes
//to update the expression context
connect( &mComposition->atlasComposition(), &QgsAtlasComposition::featureChanged, this, &QgsLayoutItemHtml::refreshExpressionContext );
#endif
connect( &mLayout->context(), &QgsLayoutContext::changed, this, &QgsLayoutItemHtml::refreshExpressionContext );
mFetcher = new QgsNetworkContentFetcher();
}
@ -496,22 +485,27 @@ void QgsLayoutItemHtml::setExpressionContext( const QgsFeature &feature, QgsVect
}
else if ( mLayout )
{
#if 0 //TODO
//set to composition's mapsettings' crs
QgsComposerMap *referenceMap = mComposition->referenceMap();
QgsLayoutItemMap *referenceMap = mLayout->referenceMap();
if ( referenceMap )
mDistanceArea->setSourceCrs( referenceMap->crs() );
#endif
mDistanceArea.setSourceCrs( referenceMap->crs(), mLayout->project()->transformContext() );
}
if ( mLayout )
{
mDistanceArea.setEllipsoid( mLayout->project()->ellipsoid() );
}
// create JSON representation of feature
QgsJsonExporter exporter( layer );
exporter.setIncludeRelated( true );
mAtlasFeatureJSON = exporter.exportFeature( feature );
if ( feature.isValid() )
{
// create JSON representation of feature
QgsJsonExporter exporter( layer );
exporter.setIncludeRelated( true );
mAtlasFeatureJSON = exporter.exportFeature( feature );
}
else
{
mAtlasFeatureJSON.clear();
}
}
void QgsLayoutItemHtml::refreshExpressionContext()
@ -519,16 +513,11 @@ void QgsLayoutItemHtml::refreshExpressionContext()
QgsVectorLayer *vl = nullptr;
QgsFeature feature;
#if 0 //TODO
if ( mComposition->atlasComposition().enabled() )
if ( mLayout )
{
vl = mComposition->atlasComposition().coverageLayer();
vl = mLayout->context().layer();
feature = mLayout->context().feature();
}
if ( mComposition->atlasMode() != QgsComposition::AtlasOff )
{
feature = mComposition->atlasComposition().feature();
}
#endif
setExpressionContext( feature, vl );
loadHtml( true );

11
src/core/layout/qgslayoutitemlabel.cpp
View File

@ -67,13 +67,6 @@ QgsLayoutItemLabel::QgsLayoutItemLabel( QgsLayout *layout )
//otherwise fields in the label aren't correctly evaluated until atlas preview feature changes (#9457)
refreshExpressionContext();
if ( mLayout )
{
//connect to context feature changes
//to update the expression context
connect( &mLayout->context(), &QgsLayoutContext::changed, this, &QgsLayoutItemLabel::refreshExpressionContext );
}
mWebPage.reset( new QgsWebPage( this ) );
mWebPage->setIdentifier( tr( "Layout label item" ) );
mWebPage->setNetworkAccessManager( QgsNetworkAccessManager::instance() );
@ -253,7 +246,7 @@ void QgsLayoutItemLabel::refreshExpressionContext()
//set to composition's reference map's crs
QgsLayoutItemMap *referenceMap = mLayout->referenceMap();
if ( referenceMap )
mDistanceArea->setSourceCrs( referenceMap->crs() );
mDistanceArea->setSourceCrs( referenceMap->crs(), mLayout->project()->transformContext() );
}
mDistanceArea->setEllipsoid( mLayout->project()->ellipsoid() );
contentChanged();
@ -493,7 +486,7 @@ void QgsLayoutItemLabel::setFrameStrokeWidth( const QgsLayoutMeasurement &stroke
void QgsLayoutItemLabel::refresh()
{
QgsLayoutItem::refresh();
contentChanged();
refreshExpressionContext();
}
void QgsLayoutItemLabel::itemShiftAdjustSize( double newWidth, double newHeight, double &xShift, double &yShift ) const