"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/qgsrelationeditorwidget.cpp" between
QGIS-final-3_14_15.tar.gz and QGIS-final-3_14_16.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Latest release (3.14.x series).

qgsrelationeditorwidget.cpp  (QGIS-final-3_14_15):qgsrelationeditorwidget.cpp  (QGIS-final-3_14_16)
skipping to change at line 50 skipping to change at line 50
#include <QLabel> #include <QLabel>
#include <QMessageBox> #include <QMessageBox>
#include <QPushButton> #include <QPushButton>
/// @cond PRIVATE /// @cond PRIVATE
/// ///
QgsFilteredSelectionManager::QgsFilteredSelectionManager( QgsVectorLayer *layer, const QgsFeatureRequest &request, QObject *parent ) QgsFilteredSelectionManager::QgsFilteredSelectionManager( QgsVectorLayer *layer, const QgsFeatureRequest &request, QObject *parent )
: QgsVectorLayerSelectionManager( layer, parent ) : QgsVectorLayerSelectionManager( layer, parent )
, mRequest( request ) , mRequest( request )
{ {
if ( ! layer )
return;
for ( auto fid : layer->selectedFeatureIds() ) for ( auto fid : layer->selectedFeatureIds() )
if ( mRequest.acceptFeature( layer->getFeature( fid ) ) ) if ( mRequest.acceptFeature( layer->getFeature( fid ) ) )
mSelectedFeatureIds << fid; mSelectedFeatureIds << fid;
connect( layer, &QgsVectorLayer::selectionChanged, this, &QgsFilteredSelection Manager::onSelectionChanged ); connect( layer, &QgsVectorLayer::selectionChanged, this, &QgsFilteredSelection Manager::onSelectionChanged );
} }
const QgsFeatureIds &QgsFilteredSelectionManager::selectedFeatureIds() const const QgsFeatureIds &QgsFilteredSelectionManager::selectedFeatureIds() const
{ {
return mSelectedFeatureIds; return mSelectedFeatureIds;
skipping to change at line 438 skipping to change at line 441
mZoomToFeatureButton->setVisible( mZoomToFeatureButton->setVisible(
mEditorContext.mapCanvas() && ( mEditorContext.mapCanvas() && (
( (
mNmRelation.isValid() && mNmRelation.isValid() &&
mNmRelation.referencedLayer()->geometryType() != QgsWkbTypes::NullGeomet ry && mNmRelation.referencedLayer()->geometryType() != QgsWkbTypes::NullGeomet ry &&
mNmRelation.referencedLayer()->geometryType() != QgsWkbTypes::UnknownGeo metry mNmRelation.referencedLayer()->geometryType() != QgsWkbTypes::UnknownGeo metry
) )
|| ||
( (
mRelation.isValid() && mRelation.isValid() &&
mRelation.referencedLayer()->geometryType() != QgsWkbTypes::NullGeometry mRelation.referencingLayer()->geometryType() != QgsWkbTypes::NullGeometr
&& y &&
mRelation.referencedLayer()->geometryType() != QgsWkbTypes::UnknownGeome mRelation.referencingLayer()->geometryType() != QgsWkbTypes::UnknownGeom
try etry
) )
) )
); );
mZoomToFeatureButton->setEnabled( selectionNotEmpty ); mZoomToFeatureButton->setEnabled( selectionNotEmpty );
mToggleEditingButton->setChecked( editable ); mToggleEditingButton->setChecked( editable );
mSaveEditsButton->setEnabled( editable ); mSaveEditsButton->setEnabled( editable );
} }
skipping to change at line 925 skipping to change at line 928
QString filter = mNmRelation.getReferencedFeatureRequest( fet ).filterEx pression()->expression(); QString filter = mNmRelation.getReferencedFeatureRequest( fet ).filterEx pression()->expression();
filters << filter.prepend( '(' ).append( ')' ); filters << filter.prepend( '(' ).append( ')' );
} }
QgsFeatureRequest nmRequest; QgsFeatureRequest nmRequest;
nmRequest.setFilterExpression( filters.join( QStringLiteral( " OR " ) ) ); nmRequest.setFilterExpression( filters.join( QStringLiteral( " OR " ) ) );
initDualView( mNmRelation.referencedLayer(), nmRequest ); initDualView( mNmRelation.referencedLayer(), nmRequest );
} }
else else if ( mRelation.referencingLayer() )
{ {
initDualView( mRelation.referencingLayer(), myRequest ); initDualView( mRelation.referencingLayer(), myRequest );
} }
} }
} }
bool QgsRelationEditorWidget::showLinkButton() const bool QgsRelationEditorWidget::showLinkButton() const
{ {
return mLinkFeatureButton->isVisible(); return mLinkFeatureButton->isVisible();
} }
 End of changes. 3 change blocks. 
5 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)