Skip to content

Commit

Permalink
port oracle provider to new_vector_api
Browse files Browse the repository at this point in the history 
+ progress dialog in progress dialog
+ fix for feature form from attribute table
  • Loading branch information
@jef-n
jef-n committed Jan 23, 2013
1 parent 83afcd6 commit 0ccff60
Show file tree
Hide file tree
Showing 11 changed files with 587 additions and 562 deletions.
90 changes: 45 additions & 45 deletions src/core/qgsvectorlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
, mLabel( 0 )
, mLabelOn( false )
, mVertexMarkerOnlyForSelection( false )
, mCache( new QgsVectorLayerCache(this) )
, mCache( new QgsVectorLayerCache( this ) )
, mEditBuffer( 0 )
, mJoinBuffer( 0 )
, mDiagramRenderer( 0 )
Expand Down Expand Up @@ -180,7 +180,7 @@ QgsVectorLayer::~QgsVectorLayer()
{
QgsDebugMsg( "entered." );

if (!mLayerIterator.isClosed())
if ( !mLayerIterator.isClosed() )
mLayerIterator.close();

emit layerDeleted();
Expand Down Expand Up @@ -1675,7 +1675,7 @@ void QgsVectorLayer::select( QgsAttributeList attributes, QgsRectangle rect, boo
if ( attributes != pendingAllAttributesList() )
request.setSubsetOfAttributes( attributes );

if (!mLayerIterator.isClosed())
if ( !mLayerIterator.isClosed() )
mLayerIterator.close();

mLayerIterator = getFeatures( request );
Expand All @@ -1689,7 +1689,7 @@ QgsFeatureIterator QgsVectorLayer::getFeatures( const QgsFeatureRequest& request
if ( !mDataProvider )
return QgsFeatureIterator();

return QgsFeatureIterator( new QgsVectorLayerFeatureIterator(this, request) );
return QgsFeatureIterator( new QgsVectorLayerFeatureIterator( this, request ) );
}


Expand Down Expand Up @@ -1759,7 +1759,7 @@ bool QgsVectorLayer::nextFeature( QgsFeature &f )
QgsFeatureIterator fi = mDataProvider->getFeatures( request );
if ( fi.nextFeature( tmp ) )
{
if (mEditBuffer)
if ( mEditBuffer )
mEditBuffer->updateChangedAttributes( tmp );
f.setAttributes( tmp.attributes() );
}
Expand Down Expand Up @@ -1819,7 +1819,7 @@ bool QgsVectorLayer::nextFeature( QgsFeature &f )
}
if ( mFetchAttributes.size() > 0 )
{
if (mEditBuffer)
if ( mEditBuffer )
mEditBuffer->updateChangedAttributes( f ); //check changed attributes
addJoinedAttributes( f ); // check joined attributes
}
Expand Down Expand Up @@ -1894,7 +1894,7 @@ bool QgsVectorLayer::featureAtId( QgsFeatureId featureId, QgsFeature& f, bool fe
if ( fi.nextFeature( tmp ) )
{
f.setAttributes( tmp.attributes() );
if (mEditBuffer)
if ( mEditBuffer )
mEditBuffer->updateChangedAttributes( f );
}
}
Expand All @@ -1904,7 +1904,7 @@ bool QgsVectorLayer::featureAtId( QgsFeatureId featureId, QgsFeature& f, bool fe
}

//added features
if (mEditBuffer)
if ( mEditBuffer )
{
for ( QgsFeatureList::iterator iter = mEditBuffer->mAddedFeatures.begin(); iter != mEditBuffer->mAddedFeatures.end(); ++iter )
{
Expand Down Expand Up @@ -1934,7 +1934,7 @@ bool QgsVectorLayer::featureAtId( QgsFeatureId featureId, QgsFeature& f, bool fe
QgsFeatureIterator fi = mDataProvider->getFeatures( request );
if ( fi.nextFeature( f ) )
{
if (mEditBuffer)
if ( mEditBuffer )
mEditBuffer->updateChangedAttributes( f );
addJoinedAttributes( f, true );
return true;
Expand All @@ -1946,11 +1946,11 @@ bool QgsVectorLayer::featureAtId( QgsFeatureId featureId, QgsFeature& f, bool fe

bool QgsVectorLayer::addFeature( QgsFeature& f, bool alsoUpdateExtent )
{
Q_UNUSED( alsoUpdateExtent ); // TODO[MD]
if ( !mEditBuffer || !mDataProvider )
return false;

// TODO[MD]: alsoUpdateExtent
return mEditBuffer->addFeature(f);
return mEditBuffer->addFeature( f );
}

bool QgsVectorLayer::updateFeature( QgsFeature &f )
Expand Down Expand Up @@ -1995,7 +1995,7 @@ bool QgsVectorLayer::insertVertex( double x, double y, QgsFeatureId atFeatureId,
if ( !mEditBuffer || !mDataProvider )
return false;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.insertVertex( x, y, atFeatureId, beforeVertex );
}

Expand All @@ -2005,7 +2005,7 @@ bool QgsVectorLayer::moveVertex( double x, double y, QgsFeatureId atFeatureId, i
if ( !mEditBuffer || !mDataProvider )
return false;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.moveVertex( x, y, atFeatureId, atVertex );
}

Expand All @@ -2015,7 +2015,7 @@ bool QgsVectorLayer::deleteVertex( QgsFeatureId atFeatureId, int atVertex )
if ( !mEditBuffer || !mDataProvider )
return false;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.deleteVertex( atFeatureId, atVertex );
}

Expand Down Expand Up @@ -2057,7 +2057,7 @@ int QgsVectorLayer::addRing( const QList<QgsPoint>& ring )
if ( !mEditBuffer || !mDataProvider )
return 6;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.addRing( ring );
}

Expand All @@ -2079,26 +2079,26 @@ int QgsVectorLayer::addPart( const QList<QgsPoint> &points )
return 5;
}

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.addPart( points, *mSelectedFeatureIds.constBegin() );
}


int QgsVectorLayer::translateFeature( QgsFeatureId featureId, double dx, double dy )
{
if (!mEditBuffer || !mDataProvider)
if ( !mEditBuffer || !mDataProvider )
return -1;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.translateFeature( featureId, dx, dy );
}

int QgsVectorLayer::splitFeatures( const QList<QgsPoint>& splitLine, bool topologicalEditing )
{
if (!mEditBuffer || !mDataProvider)
if ( !mEditBuffer || !mDataProvider )
return -1;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.splitFeatures( splitLine, topologicalEditing );
}

Expand Down Expand Up @@ -2144,19 +2144,19 @@ int QgsVectorLayer::removePolygonIntersections( QgsGeometry* geom, QgsFeatureIds

int QgsVectorLayer::addTopologicalPoints( QgsGeometry* geom )
{
if (!mEditBuffer || !mDataProvider)
if ( !mEditBuffer || !mDataProvider )
return -1;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.addTopologicalPoints( geom );
}

int QgsVectorLayer::addTopologicalPoints( const QgsPoint& p )
{
if (!mEditBuffer || !mDataProvider)
if ( !mEditBuffer || !mDataProvider )
return -1;

QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.addTopologicalPoints( p );
}

Expand Down Expand Up @@ -2204,16 +2204,16 @@ bool QgsVectorLayer::startEditing()
return false;
}

mEditBuffer = new QgsVectorLayerEditBuffer(this);
mEditBuffer = new QgsVectorLayerEditBuffer( this );
// forward signals
connect(mEditBuffer, SIGNAL(layerModified()), this, SIGNAL(layerModified())); // TODO[MD]: necessary?
connect(mEditBuffer, SIGNAL(layerModified()), this, SLOT(triggerRepaint())); // TODO[MD]: works well?
connect(mEditBuffer, SIGNAL(featureAdded(QgsFeatureId)), this, SIGNAL(featureAdded(QgsFeatureId)));
connect(mEditBuffer, SIGNAL(featureDeleted(QgsFeatureId)), this, SIGNAL(featureDeleted(QgsFeatureId)));
connect(mEditBuffer, SIGNAL(geometryChanged(QgsFeatureId,QgsGeometry&)), this, SIGNAL(geometryChanged(QgsFeatureId,QgsGeometry&)));
connect(mEditBuffer, SIGNAL(attributeValueChanged(QgsFeatureId,int,QVariant)), this, SIGNAL(attributeValueChanged(QgsFeatureId,int,QVariant)));
connect(mEditBuffer, SIGNAL(attributeAdded(int)), this, SIGNAL(attributeAdded(int)));
connect(mEditBuffer, SIGNAL(attributeDeleted(int)), this, SIGNAL(attributeDeleted(int)));
connect( mEditBuffer, SIGNAL( layerModified() ), this, SIGNAL( layerModified() ) ); // TODO[MD]: necessary?
connect( mEditBuffer, SIGNAL( layerModified() ), this, SLOT( triggerRepaint() ) ); // TODO[MD]: works well?
connect( mEditBuffer, SIGNAL( featureAdded( QgsFeatureId ) ), this, SIGNAL( featureAdded( QgsFeatureId ) ) );
connect( mEditBuffer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SIGNAL( featureDeleted( QgsFeatureId ) ) );
connect( mEditBuffer, SIGNAL( geometryChanged( QgsFeatureId, QgsGeometry& ) ), this, SIGNAL( geometryChanged( QgsFeatureId, QgsGeometry& ) ) );
connect( mEditBuffer, SIGNAL( attributeValueChanged( QgsFeatureId, int, QVariant ) ), this, SIGNAL( attributeValueChanged( QgsFeatureId, int, QVariant ) ) );
connect( mEditBuffer, SIGNAL( attributeAdded( int ) ), this, SIGNAL( attributeAdded( int ) ) );
connect( mEditBuffer, SIGNAL( attributeDeleted( int ) ), this, SIGNAL( attributeDeleted( int ) ) );

updateFields();

Expand Down Expand Up @@ -3141,10 +3141,10 @@ bool QgsVectorLayer::changeGeometry( QgsFeatureId fid, QgsGeometry* geom )

bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, QVariant value, bool emitSignal )
{
Q_UNUSED( emitSignal ); // TODO[MD]
if ( !mEditBuffer || !mDataProvider )
return false;

// TODO[MD]: emitSignal
return mEditBuffer->changeAttributeValue( fid, field, value );
}

Expand Down Expand Up @@ -3220,8 +3220,8 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid )
if ( !mEditBuffer )
return false;

bool res = mEditBuffer->deleteFeature(fid);
if (res)
bool res = mEditBuffer->deleteFeature( fid );
if ( res )
mSelectedFeatureIds.remove( fid ); // remove it from selection

return res;
Expand All @@ -3243,7 +3243,7 @@ QgsAttributeList QgsVectorLayer::pendingAllAttributesList()
int QgsVectorLayer::pendingFeatureCount()
{
return mDataProvider->featureCount() +
(mEditBuffer ? mEditBuffer->mAddedFeatures.size() - mEditBuffer->mDeletedFeatureIds.size() : 0 );
( mEditBuffer ? mEditBuffer->mAddedFeatures.size() - mEditBuffer->mDeletedFeatureIds.size() : 0 );
}

bool QgsVectorLayer::commitChanges()
Expand Down Expand Up @@ -3515,7 +3515,7 @@ void QgsVectorLayer::snapToGeometry( const QgsPoint& startPoint,

int QgsVectorLayer::insertSegmentVerticesForSnap( const QList<QgsSnappingResult>& snapResults )
{
QgsVectorLayerEditUtils utils(this);
QgsVectorLayerEditUtils utils( this );
return utils.insertSegmentVerticesForSnap( snapResults );
}

Expand Down Expand Up @@ -3917,7 +3917,7 @@ void QgsVectorLayer::setUsingRendererV2( bool usingRendererV2 )

void QgsVectorLayer::beginEditCommand( QString text )
{
undoStack()->beginMacro(text);
undoStack()->beginMacro( text );
}

void QgsVectorLayer::endEditCommand()
Expand Down Expand Up @@ -4017,7 +4017,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
return;
}

QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin(index);
QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );

if ( origin == QgsFields::OriginProvider ) //a provider field
{
Expand Down Expand Up @@ -4065,7 +4065,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
return;
}

Q_ASSERT_X(false, "QgsVectorLayer::uniqueValues()", "Unknown source of the field!");
Q_ASSERT_X( false, "QgsVectorLayer::uniqueValues()", "Unknown source of the field!" );
}

QVariant QgsVectorLayer::minimumValue( int index )
Expand All @@ -4075,7 +4075,7 @@ QVariant QgsVectorLayer::minimumValue( int index )
return QVariant();
}

QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin(index);
QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );

if ( origin == QgsFields::OriginProvider ) //a provider field
{
Expand Down Expand Up @@ -4120,7 +4120,7 @@ QVariant QgsVectorLayer::minimumValue( int index )
return QVariant( minimumValue );
}

Q_ASSERT_X(false, "QgsVectorLayer::minimumValue()", "Unknown source of the field!");
Q_ASSERT_X( false, "QgsVectorLayer::minimumValue()", "Unknown source of the field!" );
return QVariant();
}

Expand All @@ -4131,7 +4131,7 @@ QVariant QgsVectorLayer::maximumValue( int index )
return QVariant();
}

QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin(index);
QgsFields::FieldOrigin origin = mUpdatedFields.fieldOrigin( index );

if ( origin == QgsFields::OriginProvider ) //a provider field
{
Expand Down Expand Up @@ -4176,7 +4176,7 @@ QVariant QgsVectorLayer::maximumValue( int index )
return QVariant( maximumValue );
}

Q_ASSERT_X(false, "QgsVectorLayer::maximumValue()", "Unknown source of the field!");
Q_ASSERT_X( false, "QgsVectorLayer::maximumValue()", "Unknown source of the field!" );
return QVariant();
}

Expand Down
Loading

0 comments on commit 0ccff60

Please sign in to comment.