sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2704 from SebDieBln/FixFieldCalcDialogParent

Browse Source 
[Bugfix] Construct the QgsFieldCalculator dialog with the correct parent
This commit is contained in:
Nathan Woodrow 2016-01-27 21:10:46 +10:00
commit 80e3f8fc74
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgisapp.cpp
View File

@ -5474,7 +5474,7 @@ void QgisApp::fieldCalculator()
return;
}
QgsFieldCalculator calc( myLayer );
QgsFieldCalculator calc( myLayer, this );
if ( calc.exec() )
{
mMapCanvas->refresh();

2
src/app/qgsattributetabledialog.cpp
View File

@ -551,7 +551,7 @@ void QgsAttributeTableDialog::on_mOpenFieldCalculator_clicked()
{
QgsAttributeTableModel* masterModel = mMainView->masterModel();
QgsFieldCalculator calc( mLayer );
QgsFieldCalculator calc( mLayer, this );
if ( calc.exec() == QDialog::Accepted )
{
int col = masterModel->fieldCol( calc.changedAttributeId() );

4
src/app/qgsfieldcalculator.cpp
View File

@ -27,8 +27,8 @@
#include <QMessageBox>
#include <QSettings>
QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
: QDialog()
QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl, QWidget* parent )
: QDialog( parent )
, mVectorLayer( vl )
, mAttributeId( -1 )
{

2
src/app/qgsfieldcalculator.h
View File

@ -26,7 +26,7 @@ class APP_EXPORT QgsFieldCalculator: public QDialog, private Ui::QgsFieldCalcula
{
Q_OBJECT
public:
QgsFieldCalculator( QgsVectorLayer* vl );
QgsFieldCalculator( QgsVectorLayer* vl, QWidget* parent = nullptr );
~QgsFieldCalculator();
int changedAttributeId() const { return mAttributeId; }

2
src/app/qgsfieldsproperties.cpp
View File

@ -762,7 +762,7 @@ void QgsFieldsProperties::on_mCalculateFieldButton_clicked()
return;
}
QgsFieldCalculator calc( mLayer );
QgsFieldCalculator calc( mLayer, this );
calc.exec();
}