Skip to content

Commit

Permalink
[GRASS] disabled editing of cat and topo symbol
Browse files Browse the repository at this point in the history
  • Loading branch information
@blazek
blazek committed Oct 5, 2015
1 parent b219b5e commit 52e7628
Show file tree
Hide file tree
Showing 2 changed files with 150 additions and 74 deletions.
218 changes: 145 additions & 73 deletions src/providers/grass/qgsgrassprovider.cpp
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ QgsGrassProvider::QgsGrassProvider( QString uri )
, mEditBuffer( 0 ) , mEditBuffer( 0 )
, mEditLayer( 0 ) , mEditLayer( 0 )
, mNewFeatureType( 0 ) , mNewFeatureType( 0 )
, mPoints( 0 )
, mCats( 0 )
{ {
QgsDebugMsg( "uri = " + uri ); QgsDebugMsg( "uri = " + uri );


Expand All @@ -99,6 +101,9 @@ QgsGrassProvider::QgsGrassProvider( QString uri )
QTime time; QTime time;
time.start(); time.start();


mPoints = Vect_new_line_struct();
mCats = Vect_new_cats_struct();

// Parse URI // Parse URI
QDir dir( uri ); // it is not a directory in fact QDir dir( uri ); // it is not a directory in fact
QString myURI = dir.path(); // no dupl '/' QString myURI = dir.path(); // no dupl '/'
Expand Down Expand Up @@ -232,6 +237,23 @@ QgsGrassProvider::QgsGrassProvider( QString uri )
QgsDebugMsg( QString( "New GRASS layer opened, time (ms): %1" ).arg( time.elapsed() ) ); QgsDebugMsg( QString( "New GRASS layer opened, time (ms): %1" ).arg( time.elapsed() ) );
} }


QgsGrassProvider::~QgsGrassProvider()
{
QgsDebugMsg( "entered" );
if ( mLayer )
{
mLayer->close();
}
if ( mPoints )
{
Vect_destroy_line_struct( mPoints );
}
if ( mCats )
{
Vect_destroy_cats_struct( mCats );
}
}

int QgsGrassProvider::capabilities() const int QgsGrassProvider::capabilities() const
{ {
// for now, only one map may be edited at time // for now, only one map may be edited at time
Expand Down Expand Up @@ -333,16 +355,6 @@ void QgsGrassProvider::update()
mValid = true; mValid = true;
} }


QgsGrassProvider::~QgsGrassProvider()
{
QgsDebugMsg( "entered" );
if ( mLayer )
{
mLayer->close();
}
}


QgsAbstractFeatureSource* QgsGrassProvider::featureSource() const QgsAbstractFeatureSource* QgsGrassProvider::featureSource() const
{ {
const_cast<QgsGrassProvider*>( this )->ensureUpdated(); const_cast<QgsGrassProvider*>( this )->ensureUpdated();
Expand Down Expand Up @@ -640,15 +652,35 @@ int QgsGrassProvider::readLine( struct line_pnts *Points, struct line_cats *Cats
QgsDebugMsgLevel( "entered", 3 ); QgsDebugMsgLevel( "entered", 3 );


if ( Points ) if ( Points )
{
Vect_reset_line( Points ); Vect_reset_line( Points );
}


if ( Cats ) if ( Cats )
{
Vect_reset_cats( Cats ); Vect_reset_cats( Cats );
}

if ( !map() )
{
return -1;
}


if ( !Vect_line_alive( map(), line ) ) if ( !Vect_line_alive( map(), line ) )
{
return -1; return -1;
}


return ( Vect_read_line( map(), Points, Cats, line ) ); int type = -1;
G_TRY
{
type = Vect_read_line( map(), mPoints, mCats, line );
}
G_CATCH( QgsGrass::Exception &e )
{
QgsDebugMsg( QString( "Cannot read line : %1" ).arg( e.what() ) );
}
return type;
} }


bool QgsGrassProvider::nodeCoor( int node, double *x, double *y ) bool QgsGrassProvider::nodeCoor( int node, double *x, double *y )
Expand Down Expand Up @@ -697,14 +729,38 @@ int QgsGrassProvider::writeLine( int type, struct line_pnts *Points, struct line
return (( int ) Vect_write_line( map(), type, Points, Cats ) ); return (( int ) Vect_write_line( map(), type, Points, Cats ) );
} }


int QgsGrassProvider::rewriteLine( int line, int type, struct line_pnts *Points, struct line_cats *Cats ) int QgsGrassProvider::rewriteLine( int oldLid, int type, struct line_pnts *Points, struct line_cats *Cats )
{ {
QgsDebugMsg( QString( "n_points = %1 n_cats = %2" ).arg( Points->n_points ).arg( Cats->n_cats ) ); QgsDebugMsg( QString( "n_points = %1 n_cats = %2" ).arg( Points->n_points ).arg( Cats->n_cats ) );


if ( !isEdited() ) if ( !map() || !isEdited() )
{
return -1; return -1;
}

int newLid = -1;
G_TRY
{
newLid = Vect_rewrite_line( map(), oldLid, type, Points, Cats );

// oldLids are maping to the very first, original version (used by undo)
int oldestLid = oldLid;
if ( mLayer->map()->oldLids().contains( oldLid ) ) // if it was changed already
{
oldestLid = mLayer->map()->oldLids().value( oldLid );
}


return ( Vect_rewrite_line( map(), line, type, Points, Cats ) ); QgsDebugMsg( QString( "oldLid = %1 oldestLid = %2 newLine = %3" ).arg( oldLid ).arg( oldestLid ).arg( newLid ) );
QgsDebugMsg( QString( "oldLids : %1 -> %2" ).arg( newLid ).arg( oldestLid ) );
mLayer->map()->oldLids()[newLid] = oldestLid;
QgsDebugMsg( QString( "newLids : %1 -> %2" ).arg( oldestLid ).arg( newLid ) );
mLayer->map()->newLids()[oldestLid] = newLid;
}
G_CATCH( QgsGrass::Exception &e )
{
QgsDebugMsg( QString( "Cannot write line : %1" ).arg( e.what() ) );
}
return newLid;
} }




Expand Down Expand Up @@ -1030,6 +1086,11 @@ void QgsGrassProvider::startEditing( QgsVectorLayer *vectorLayer )
// let qgis know (attribute table etc.) that we added topo symbol field // let qgis know (attribute table etc.) that we added topo symbol field
vectorLayer->updateFields(); vectorLayer->updateFields();


// TODO: enable cats editing once all consequences are implemented
// disable cat and topo symbol editing
vectorLayer->setFieldEditable( mLayer->keyColumn(), false );
vectorLayer->setFieldEditable( mLayer->fields().size() - 1, false );

QgsDebugMsg( "edit started" ); QgsDebugMsg( "edit started" );
} }


Expand Down Expand Up @@ -1139,11 +1200,9 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid )
} }
else else
{ {
struct line_pnts *points = Vect_new_line_struct();
struct line_cats *cats = Vect_new_cats_struct();
int newCat = 0; int newCat = 0;


setPoints( points, geometry ); setPoints( mPoints, geometry );
// TODO: get also old type if it is feature previously deleted // TODO: get also old type if it is feature previously deleted
int type = mNewFeatureType == GV_AREA ? GV_BOUNDARY : mNewFeatureType; int type = mNewFeatureType == GV_AREA ? GV_BOUNDARY : mNewFeatureType;


Expand Down Expand Up @@ -1182,7 +1241,8 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid )
} }
} }
QgsDebugMsg( QString( "newCat = %1" ).arg( newCat ) ); QgsDebugMsg( QString( "newCat = %1" ).arg( newCat ) );
Vect_cat_set( cats, mLayerField, newCat ); Vect_reset_cats( mCats );
Vect_cat_set( mCats, mLayerField, newCat );
QString error; QString error;


// if the cat is user defined, the record may alredy exist // if the cat is user defined, the record may alredy exist
Expand Down Expand Up @@ -1265,14 +1325,15 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid )
{ {
// TODO: orig field, maybe different // TODO: orig field, maybe different
int field = mLayerField; int field = mLayerField;
Vect_cat_set( cats, field, cat ); Vect_reset_cats( mCats );
Vect_cat_set( mCats, field, cat );
} }
} }


if ( type > 0 && points->n_points > 0 ) if ( type > 0 && mPoints->n_points > 0 )
{ {
mLayer->map()->lockReadWrite(); mLayer->map()->lockReadWrite();
int newLid = Vect_write_line( map(), type, points, cats ); int newLid = Vect_write_line( map(), type, mPoints, mCats );
mLayer->map()->unlockReadWrite(); mLayer->map()->unlockReadWrite();


QgsDebugMsg( QString( "newLine = %1" ).arg( newLid ) ); QgsDebugMsg( QString( "newLine = %1" ).arg( newLid ) );
Expand Down Expand Up @@ -1334,14 +1395,11 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid )
} }
} }


if ( type == GV_BOUNDARY ) if ( type == GV_BOUNDARY || type == GV_CENTROID )
{ {
setAddedFeaturesSymbol(); setAddedFeaturesSymbol();
} }
} }

Vect_destroy_line_struct( points );
Vect_destroy_cats_struct( cats );
} }
} }


Expand Down Expand Up @@ -1395,7 +1453,7 @@ void QgsGrassProvider::onFeatureDeleted( QgsFeatureId fid )
} }
mLayer->map()->unlockReadWrite(); mLayer->map()->unlockReadWrite();


if ( type == GV_BOUNDARY ) if ( type == GV_BOUNDARY || type == GV_CENTROID )
{ {
setAddedFeaturesSymbol(); setAddedFeaturesSymbol();
} }
Expand All @@ -1411,22 +1469,12 @@ void QgsGrassProvider::onGeometryChanged( QgsFeatureId fid, QgsGeometry &geom )
} }
QgsDebugMsg( QString( "fid = %1 oldLid = %2 realLine = %3" ).arg( fid ).arg( oldLid ).arg( realLine ) ); QgsDebugMsg( QString( "fid = %1 oldLid = %2 realLine = %3" ).arg( fid ).arg( oldLid ).arg( realLine ) );


struct line_pnts *points = Vect_new_line_struct(); int type = readLine( mPoints, mCats, realLine );
struct line_cats *cats = Vect_new_cats_struct(); QgsDebugMsg( QString( "type = %1 n_points = %2" ).arg( type ).arg( mPoints->n_points ) );

if ( type < 1 ) // error
int type = 0;
G_TRY
{
type = Vect_read_line( map(), points, cats, realLine );
}
G_CATCH( QgsGrass::Exception &e )
{ {
QgsDebugMsg( QString( "Cannot read line : %1" ).arg( e.what() ) );
Vect_destroy_line_struct( points );
Vect_destroy_cats_struct( cats );
return; return;
} }
QgsDebugMsg( QString( "type = %1 n_points = %2" ).arg( type ).arg( points->n_points ) );


// store only the first original geometry if it is not new feature, changed geometries are stored in the buffer // store only the first original geometry if it is not new feature, changed geometries are stored in the buffer
if ( oldLid > 0 && !mLayer->map()->oldGeometries().contains( oldLid ) ) if ( oldLid > 0 && !mLayer->map()->oldGeometries().contains( oldLid ) )
Expand All @@ -1443,37 +1491,16 @@ void QgsGrassProvider::onGeometryChanged( QgsFeatureId fid, QgsGeometry &geom )
} }
} }


setPoints( points, geom.geometry() ); setPoints( mPoints, geom.geometry() );


mLayer->map()->lockReadWrite(); mLayer->map()->lockReadWrite();
// Vect_rewrite_line may delete/write the line with a new id // Vect_rewrite_line may delete/write the line with a new id
int newLid = Vect_rewrite_line( map(), realLine, type, points, cats ); int newLid = rewriteLine( realLine, type, mPoints, mCats );
G_TRY Q_UNUSED( newLid )
{
newLid = Vect_rewrite_line( map(), realLine, type, points, cats );


// oldLids are maping to the very first, original version (used by undo)
int oldestLid = oldLid;
if ( mLayer->map()->oldLids().contains( oldLid ) )
{
oldestLid = mLayer->map()->oldLids().value( oldLid );
}
QgsDebugMsg( QString( "oldLid = %1 oldestLid = %2 newLine = %3" ).arg( oldLid ).arg( oldestLid ).arg( newLid ) );
QgsDebugMsg( QString( "oldLids : %1 -> %2" ).arg( newLid ).arg( oldestLid ) );
mLayer->map()->oldLids()[newLid] = oldestLid;
QgsDebugMsg( QString( "newLids : %1 -> %2" ).arg( oldestLid ).arg( newLid ) );
mLayer->map()->newLids()[oldestLid] = newLid;
}
G_CATCH( QgsGrass::Exception &e )
{
QgsDebugMsg( QString( "Cannot write line : %1" ).arg( e.what() ) );
}
mLayer->map()->unlockReadWrite(); mLayer->map()->unlockReadWrite();


Vect_destroy_line_struct( points ); if ( type == GV_BOUNDARY || type == GV_CENTROID )
Vect_destroy_cats_struct( cats );

if ( type == GV_BOUNDARY )
{ {
setAddedFeaturesSymbol(); setAddedFeaturesSymbol();
} }
Expand Down Expand Up @@ -1506,19 +1533,65 @@ void QgsGrassProvider::onAttributeValueChanged( QgsFeatureId fid, int idx, const
} }
QgsField field = mEditLayer->fields()[idx]; QgsField field = mEditLayer->fields()[idx];


if ( realCat > 0 ) QgsDebugMsg( "field.name() = " + field.name() + " keyColumnName() = " + mLayer->keyColumnName() );
// TODO: Changing existing category is currently disabled (read only widget set on layer)
// bacause it makes it all too complicated
if ( field.name() == mLayer->keyColumnName() )
{ {
QString error; // user changed category -> rewrite line
mLayer->changeAttributeValue( realCat, field, value, error ); QgsDebugMsg( "cat changed -> rewrite line" );
if ( !error.isEmpty() ) int type = readLine( mPoints, mCats, realLine );
if ( type <= 0 )
{ {
QgsGrass::warning( error ); QgsDebugMsg( "cannot read line" );
}
else
{
if ( Vect_field_cat_del( mCats, mLayerField, realCat ) == 0 )
{
// should not happen
QgsDebugMsg( "the line does not have old category" );
}

int newCat = value.toInt();
QgsDebugMsg( QString( "realCat = %1 newCat = %2" ).arg( realCat ).arg( newCat ) );
if ( newCat == 0 )
{
QgsDebugMsg( "new category is 0" );
// TODO: remove category from line?
}
else
{
Vect_cat_set( mCats, mLayerField, newCat );
mLayer->map()->lockReadWrite();
int newLid = rewriteLine( realLine, type, mPoints, mCats );
Q_UNUSED( newLid )

// TODO: - store the new cat somewhere for cats mapping
// - insert record if does not exist
// - update feature attributes by existing record?

mLayer->map()->unlockReadWrite();
}
} }
} }
else else
{ {
QgsDebugMsg( "no cat -> add new cat to line" );
// TODO if ( realCat > 0 )
{
QString error;
mLayer->changeAttributeValue( realCat, field, value, error );
if ( !error.isEmpty() )
{
QgsGrass::warning( error );
}
}
else
{
QgsDebugMsg( "no cat -> add new cat to line" );
// TODO
}
} }
} }


Expand Down Expand Up @@ -1574,8 +1647,7 @@ void QgsGrassProvider::setAddedFeaturesSymbol()
Q_FOREACH ( QgsFeatureId fid, features.keys() ) Q_FOREACH ( QgsFeatureId fid, features.keys() )
{ {
QgsFeature feature = features[fid]; QgsFeature feature = features[fid];
if ( !feature.geometry() || !feature.geometry()->geometry() || if ( !feature.geometry() || !feature.geometry()->geometry() )
feature.geometry()->geometry()->wkbType() != QgsWKBTypes::LineString )
{ {
continue; continue;
} }
Expand Down
6 changes: 5 additions & 1 deletion src/providers/grass/qgsgrassprovider.h
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
* @return line number * @return line number
* @return -1 error * @return -1 error
*/ */
int rewriteLine( int line, int type, struct line_pnts *Points, struct line_cats *Cats ); int rewriteLine( int lid, int type, struct line_pnts *Points, struct line_cats *Cats );


/** Delete line /** Delete line
* @return 0 OK * @return 0 OK
Expand Down Expand Up @@ -461,6 +461,10 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
// next digitized feature GRASS type // next digitized feature GRASS type
int mNewFeatureType; int mNewFeatureType;


// points and cats used only for editing
struct line_pnts *mPoints;
struct line_cats *mCats;

friend class QgsGrassFeatureSource; friend class QgsGrassFeatureSource;
friend class QgsGrassFeatureIterator; friend class QgsGrassFeatureIterator;
}; };
Expand Down

0 comments on commit 52e7628

Please sign in to comment.