Skip to content

Commit

Permalink
Fix unreported crash opening polymorphic relations dialog for editing (…
Browse files Browse the repository at this point in the history 
…#43624)

* Fix unreported crash opening polymorphic relations dialog for editing

* Add suggestions from code review + make dialog gui more confortable

* Use qobject_cast for casting qobjects
  • Loading branch information
@domi4484
domi4484 committed Jun 10, 2021
1 parent fc1ded8 commit 6e9cae1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 39 deletions.
33 changes: 15 additions & 18 deletions src/app/qgsrelationaddpolymorphicdialog.cpp
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgsrelationaddpolymorphicdlg.cpp
qgsrelationaddpolymorphicdialog.cpp
---------------------
begin : December 2020
copyright : (C) 2020 by Ivan Ivanov
Expand All @@ -14,13 +14,9 @@
***************************************************************************/

#include <QDialogButtonBox>
#include <QLabel>
#include <QToolButton>
#include <QPushButton>
#include <QToolButton>
#include <QComboBox>
#include <QLineEdit>
#include <QHBoxLayout>
#include <QVBoxLayout>

#include "qgsrelationaddpolymorphicdialog.h"
#include "qgsvectorlayer.h"
Expand Down Expand Up @@ -94,18 +90,19 @@ void QgsRelationAddPolymorphicDialog::setPolymorphicRelation( const QgsPolymorph
mReferencedLayerExpressionWidget->setExpression( polyRel.referencedLayerExpression() );
mRelationStrengthComboBox->setCurrentIndex( mRelationStrengthComboBox->findData( polyRel.strength() ) );

const QStringList layerIds = polyRel.referencedLayerIds();
for ( const QString &layerId : layerIds )
mReferencedLayersComboBox->setItemCheckState( mReferencedLayersComboBox->findData( layerId ), Qt::Checked );
referencedLayersChanged();

int index = 0;
const QList<QgsRelation::FieldPair> fieldPairs = polyRel.fieldPairs();
for ( const QgsRelation::FieldPair &fieldPair : fieldPairs )
{
static_cast<QLineEdit *>( mFieldsMappingTable->cellWidget( index, 0 ) )->setText( fieldPair.referencedField() );
static_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( index, 1 ) )->setCurrentText( fieldPair.referencingField() );
qobject_cast<QComboBox *>( mFieldsMappingTable->cellWidget( index, 0 ) )->setCurrentText( fieldPair.referencedField() );
qobject_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( index, 1 ) )->setCurrentText( fieldPair.referencingField() );
index++;
}

const QStringList layerIds = polyRel.referencedLayerIds();
for ( const QString &layerId : layerIds )
mReferencedLayersComboBox->setItemCheckState( mReferencedLayersComboBox->findData( layerId ), Qt::Checked );
}

void QgsRelationAddPolymorphicDialog::updateTypeConfigWidget()
Expand Down Expand Up @@ -198,11 +195,11 @@ QList< QPair< QString, QString > > QgsRelationAddPolymorphicDialog::fieldPairs()
QList< QPair< QString, QString > > references;
for ( int i = 0, l = mFieldsMappingTable->rowCount(); i < l; i++ )
{
QComboBox *referencedFieldComboBox = static_cast<QComboBox *>( mFieldsMappingTable->cellWidget( i, 0 ) );
QComboBox *referencedFieldComboBox = qobject_cast<QComboBox *>( mFieldsMappingTable->cellWidget( i, 0 ) );
if ( referencedFieldComboBox->currentData().toInt() == -1 )
continue;
QString referencedField = referencedFieldComboBox->currentText();
QString referencingField = static_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( i, 1 ) )->currentField();
QString referencingField = qobject_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( i, 1 ) )->currentField();
references << qMakePair( referencingField, referencedField );
}

Expand Down Expand Up @@ -239,8 +236,8 @@ bool QgsRelationAddPolymorphicDialog::isDefinitionValid()

for ( int i = 0, l = mFieldsMappingTable->rowCount(); i < l; i++ )
{
isValid &= !static_cast<QLineEdit *>( mFieldsMappingTable->cellWidget( i, 0 ) )->text().isNull();
isValid &= !static_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( i, 1 ) )->currentField().isNull();
isValid &= qobject_cast<QComboBox *>( mFieldsMappingTable->cellWidget( i, 0 ) )->currentData().toInt() != -1;
isValid &= !qobject_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( i, 1 ) )->currentField().isNull();
}

return isValid;
Expand Down Expand Up @@ -275,7 +272,7 @@ void QgsRelationAddPolymorphicDialog::updateReferencingFieldsComboBoxes()

for ( int i = 0, l = mFieldsMappingTable->rowCount(); i < l; i++ )
{
auto fieldComboBox = static_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( i, 1 ) );
auto fieldComboBox = qobject_cast<QgsFieldComboBox *>( mFieldsMappingTable->cellWidget( i, 1 ) );
fieldComboBox->setLayer( vl );
}
}
Expand Down Expand Up @@ -312,7 +309,7 @@ void QgsRelationAddPolymorphicDialog::referencedLayersChanged()

for ( int i = 0, l = mFieldsMappingTable->rowCount(); i < l; i++ )
{
QComboBox *cb = static_cast<QComboBox *>( mFieldsMappingTable->cellWidget( i, 0 ) );
QComboBox *cb = qobject_cast<QComboBox *>( mFieldsMappingTable->cellWidget( i, 0 ) );
const QString currentField = cb->currentText();
cb->clear();
if ( fields.count() > 0 )
Expand Down
14 changes: 1 addition & 13 deletions src/app/qgsrelationaddpolymorphicdialog.h
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgsrelationaddpolymorphicdlg.h
qgsrelationaddpolymorphicdialog.h
---------------------
begin : December 2020
copyright : (C) 2020 by Ivan Ivanov
Expand All @@ -20,18 +20,6 @@
#include "ui_qgsrelationmanageraddpolymorphicdialogbase.h"
#include "qgsrelation.h"

class QDialogButtonBox;
class QComboBox;
class QLineEdit;
class QSpacerItem;
class QToolButton;
class QVBoxLayout;
class QHBoxLayout;

class QgsVectorLayer;
class QgsFieldComboBox;
class QgsMapLayerComboBox;

/**
* QgsRelationAddDlg allows configuring a new relation.
* Multiple field pairs can be set.
Expand Down
10 changes: 2 additions & 8 deletions src/ui/qgsrelationmanageraddpolymorphicdialogbase.ui
View file
Expand Up @@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>297</width>
<width>453</width>
<height>487</height>
</rect>
</property>
<property name="windowTitle">
<string>Add Polymorphic Relation</string>
</property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
<item row="7" column="0">
<widget class="QLabel" name="mReferencedLayersLabel">
<property name="text">
Expand All @@ -23,12 +23,6 @@
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mIdLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="placeholderText">
<string>[Generated automatically]</string>
</property>
Expand Down

0 comments on commit 6e9cae1

Please sign in to comment.