Skip to content

Commit e7a3a28

Browse files
signedavsignedav
committedOct 27, 2017
commit
·
ltr-3_40final-3_0_0
1 parent e724dfc commit e7a3a28

File tree

1 file changed

+42
-40
lines changed

1 file changed

+42
-40
lines changed
 

‎src/app/qgsattributesformproperties.cpp

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,11 @@ void QgsAttributesFormProperties::loadAttributeRelationEdit()
193193
delete mAttributeRelationEdit;
194194

195195
//oder mit dem? RelationConfig relCfg = configForRelation( itemData.name() );
196-
RelationConfig cfg = currentItem->data( 0, RelationConfigRole).value<RelationConfig>();
196+
RelationConfig cfg = currentItem->data( 0, RelationConfigRole ).value<RelationConfig>();
197197

198198
mAttributeRelationEdit = new QgsAttributeRelationEdit( currentItem->data( 0, FieldNameRole ).toString(), mAttributeTypeFrame );
199-
mAttributeRelationEdit->setCardinalityCombo( "testoption 1");
200-
mAttributeRelationEdit->setCardinalityCombo( "testoption 2");
199+
mAttributeRelationEdit->setCardinalityCombo( "testoption 1" );
200+
mAttributeRelationEdit->setCardinalityCombo( "testoption 2" );
201201
mAttributeRelationEdit->setCardinality( cfg.mCardinality );
202202

203203
mAttributeRelationEdit->layout()->setMargin( 0 );
@@ -212,21 +212,22 @@ void QgsAttributesFormProperties::loadAttributeRelationEdit()
212212

213213
void QgsAttributesFormProperties::storeAttributeRelationEdit()
214214
{
215-
RelationConfig cfg;
215+
RelationConfig cfg;
216216

217-
cfg.mCardinality = mAttributeRelationEdit->cardinality();
217+
cfg.mCardinality = mAttributeRelationEdit->cardinality();
218218

219-
QTreeWidgetItem* relationContainer=mAvailableWidgetsTree->invisibleRootItem()->child(1);
219+
QTreeWidgetItem *relationContainer = mAvailableWidgetsTree->invisibleRootItem()->child( 1 );
220220

221-
for ( int i = 0; i < relationContainer->childCount(); i++ )
222-
{
223-
QTreeWidgetItem *relationItem = relationContainer->child( i );
224-
DnDTreeItemData itemData= relationItem->data( 0, DnDTreeRole ).value<DnDTreeItemData>();
221+
for ( int i = 0; i < relationContainer->childCount(); i++ )
222+
{
223+
QTreeWidgetItem *relationItem = relationContainer->child( i );
224+
DnDTreeItemData itemData = relationItem->data( 0, DnDTreeRole ).value<DnDTreeItemData>();
225225

226-
if( itemData.name()==mAttributeRelationEdit->mRelationId ){
227-
relationItem->setData( 0, RelationConfigRole, QVariant::fromValue<RelationConfig>( cfg ) );
228-
}
226+
if ( itemData.name() == mAttributeRelationEdit->mRelationId )
227+
{
228+
relationItem->setData( 0, RelationConfigRole, QVariant::fromValue<RelationConfig>( cfg ) );
229229
}
230+
}
230231
}
231232

232233
QgsAttributesFormProperties::FieldConfig QgsAttributesFormProperties::configForChild( int index )
@@ -369,7 +370,7 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
369370

370371
//load Fields
371372

372-
DnDTreeItemData catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Fields");
373+
DnDTreeItemData catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Fields" );
373374
QTreeWidgetItem *catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData );
374375

375376
const QgsFields fields = mLayer->fields();
@@ -397,14 +398,14 @@ void QgsAttributesFormProperties::initAvailableWidgetsTree()
397398

398399

399400
//load Relations
400-
catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Relations");
401+
catItemData = DnDTreeItemData( DnDTreeItemData::Container, "Relations" );
401402
catitem = mAvailableWidgetsTree->addItem( mAvailableWidgetsTree->invisibleRootItem(), catItemData );
402403

403404
const QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( mLayer );
404405

405406
for ( const QgsRelation &relation : relations )
406407
{
407-
DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Relation, QStringLiteral( "%1" ).arg( relation.id() )); //relation.name() );
408+
DnDTreeItemData itemData = DnDTreeItemData( DnDTreeItemData::Relation, QStringLiteral( "%1" ).arg( relation.id() ) ); //relation.name() );
408409
itemData.setShowLabel( true );
409410

410411
RelationConfig cfg( mLayer, relation.id() );
@@ -502,24 +503,25 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
502503

503504
void QgsAttributesFormProperties::apply()
504505
{
505-
if( mAttributeTypeDialog )
506+
if ( mAttributeTypeDialog )
506507
{
507508
storeAttributeTypeDialog();
508-
}else
509+
}
510+
else
509511
{
510512
storeAttributeRelationEdit();
511513
}
512514

513515
QgsEditFormConfig editFormConfig = mLayer->editFormConfig();
514516

515-
QTreeWidgetItem* fieldContainer=mAvailableWidgetsTree->invisibleRootItem()->child(0);
517+
QTreeWidgetItem *fieldContainer = mAvailableWidgetsTree->invisibleRootItem()->child( 0 );
516518

517519
int idx;
518520

519521
for ( int i = 0; i < fieldContainer->childCount(); i++ )
520522
{
521523
QTreeWidgetItem *fieldItem = fieldContainer->child( i );
522-
idx=fieldContainer->indexOfChild( fieldItem );
524+
idx = fieldContainer->indexOfChild( fieldItem );
523525

524526
QString name = mLayer->fields().at( idx ).name();
525527
FieldConfig cfg = configForChild( idx );
@@ -581,42 +583,42 @@ void QgsAttributesFormProperties::apply()
581583

582584

583585
// relations
584-
QTreeWidgetItem* relationContainer=mAvailableWidgetsTree->invisibleRootItem()->child(1);
586+
QTreeWidgetItem *relationContainer = mAvailableWidgetsTree->invisibleRootItem()->child( 1 );
585587

586588
for ( int i = 0; i < relationContainer->childCount(); i++ )
587589
{
588590
QTreeWidgetItem *relationItem = relationContainer->child( i );
589-
DnDTreeItemData itemData= relationItem->data( 0, DnDTreeRole ).value<DnDTreeItemData>();
591+
DnDTreeItemData itemData = relationItem->data( 0, DnDTreeRole ).value<DnDTreeItemData>();
590592

591593
RelationConfig relCfg = configForRelation( itemData.name() );
592594

593595
QVariantMap cfg;
594-
cfg[QStringLiteral( "nm-rel" )]=relCfg.mCardinality;
596+
cfg[QStringLiteral( "nm-rel" )] = relCfg.mCardinality;
595597

596598
editFormConfig.setWidgetConfig( itemData.name(), cfg );
597599
}
598600

599-
/*
601+
/*
600602
601-
for ( int i = 0; i < mRelationsList->rowCount(); ++i )
602-
{
603-
QVariantMap cfg;
603+
for ( int i = 0; i < mRelationsList->rowCount(); ++i )
604+
{
605+
QVariantMap cfg;
604606
605-
QComboBox *cb = qobject_cast<QComboBox *>( mRelationsList->cellWidget( i, RelNmCol ) );
606-
QVariant otherRelation = cb->currentData();
607+
QComboBox *cb = qobject_cast<QComboBox *>( mRelationsList->cellWidget( i, RelNmCol ) );
608+
QVariant otherRelation = cb->currentData();
607609
608-
if ( otherRelation.isValid() )
609-
{
610-
cfg[QStringLiteral( "nm-rel" )] = otherRelation.toString();
611-
}
610+
if ( otherRelation.isValid() )
611+
{
612+
cfg[QStringLiteral( "nm-rel" )] = otherRelation.toString();
613+
}
612614
613-
DesignerTreeItemData itemData = mRelationsList->item( i, RelNameCol )->data( DesignerTreeRole ).value<DesignerTreeItemData>();
615+
DesignerTreeItemData itemData = mRelationsList->item( i, RelNameCol )->data( DesignerTreeRole ).value<DesignerTreeItemData>();
614616
615-
QString relationName = itemData.name();
617+
QString relationName = itemData.name();
616618
617-
editFormConfig.setWidgetConfig( relationName, cfg );
618-
}
619-
*/
619+
editFormConfig.setWidgetConfig( relationName, cfg );
620+
}
621+
*/
620622

621623
mLayer->setEditFormConfig( editFormConfig );
622624
}
@@ -639,7 +641,7 @@ QgsAttributesFormProperties::FieldConfig::FieldConfig()
639641
QgsAttributesFormProperties::FieldConfig::FieldConfig( QgsVectorLayer *layer, int idx )
640642
: mButton( nullptr )
641643
{
642-
mAlias=layer->fields().at( idx ).alias();
644+
mAlias = layer->fields().at( idx ).alias();
643645
mEditable = !layer->editFormConfig().readOnly( idx );
644646
mEditableEnabled = layer->fields().fieldOrigin( idx ) != QgsFields::OriginJoin
645647
&& layer->fields().fieldOrigin( idx ) != QgsFields::OriginExpression;
@@ -673,7 +675,7 @@ QgsAttributesFormProperties::RelationConfig::RelationConfig( QgsVectorLayer *lay
673675
{
674676
const QVariant nmrelcfg = layer->editFormConfig().widgetConfig( relationId ).value( QStringLiteral( "nm-rel" ) );
675677

676-
mCardinality=nmrelcfg.toString();
678+
mCardinality = nmrelcfg.toString();
677679
}
678680

679681
QgsAttributesFormProperties::RelationConfig::operator QVariant()

0 commit comments

Comments
 (0)
Please sign in to comment.