fixed ticket 290, reset selected line when a cat is deleted/added

rblazek · rblazek · commit 897570198b64 · 2006-12-12T13:05:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6248 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp
@@ -1436,6 +1436,7 @@ void QgsGrassEdit::addCat ( int line )
   }
 
   line = mProvider->rewriteLine ( line, type, mPoints, mCats );
+  mSelectedLine = line;
   if ( mAttributes ) mAttributes->setLine ( line );
   updateSymb();
   increaseMaxCat();
@@ -1471,6 +1472,7 @@ void QgsGrassEdit::deleteCat ( int line, int field, int cat )
   Vect_field_cat_del ( mCats, field, cat );
 
   line = mProvider->rewriteLine ( line, type, mPoints, mCats );
+  mSelectedLine = line;
   if ( mAttributes ) mAttributes->setLine ( line );
 
   // Check orphan record
diff --git a/src/plugins/grass/qgsgrassedittools.cpp b/src/plugins/grass/qgsgrassedittools.cpp
@@ -94,6 +94,7 @@ void QgsGrassEditNewPoint::mouseClick(QgsPoint & point, Qt::ButtonState button)
 
     if ( e->mAttributes ) 
     {
+        e->mAttributes->setLine ( line );
         e->mAttributes->clear();
     }
     else
@@ -193,6 +194,7 @@ void QgsGrassEditNewLine::mouseClick(QgsPoint & point, Qt::ButtonState button)
 
 	if ( e->mAttributes ) 
 	{
+            e->mAttributes->setLine ( line );
 	    e->mAttributes->clear();
 	}
 	else
@@ -799,6 +801,7 @@ void QgsGrassEditAttributes::mouseClick(QgsPoint & point, Qt::ButtonState button
 
   if ( e->mAttributes ) 
   {
+      e->mAttributes->setLine ( 0 );
       e->mAttributes->clear();
       e->mAttributes->raise();
   }
@@ -812,6 +815,10 @@ void QgsGrassEditAttributes::mouseClick(QgsPoint & point, Qt::ButtonState button
     {
         e->mAttributes = new QgsGrassAttributes ( e, e->mProvider, e->mSelectedLine, e->mQgisApp );
     }
+    else
+    {
+      e->mAttributes->setLine ( e->mSelectedLine );
+    }
     for ( int i = 0; i < e->mCats->n_cats; i++ ) {
       e->addAttributes ( e->mCats->field[i], e->mCats->cat[i] );
     }

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ void QgsGrassEditNewPoint::mouseClick(QgsPoint & point, Qt::ButtonState button)`
`94`	`94`
`95`	`95`	`if ( e->mAttributes )`
`96`	`96`	`{`
	`97`	`+ e->mAttributes->setLine ( line );`
`97`	`98`	`e->mAttributes->clear();`
`98`	`99`	`}`
`99`	`100`	`else`
`@@ -193,6 +194,7 @@ void QgsGrassEditNewLine::mouseClick(QgsPoint & point, Qt::ButtonState button)`
`193`	`194`
`194`	`195`	`if ( e->mAttributes )`
`195`	`196`	`{`
	`197`	`+ e->mAttributes->setLine ( line );`
`196`	`198`	`e->mAttributes->clear();`
`197`	`199`	`}`
`198`	`200`	`else`
`@@ -799,6 +801,7 @@ void QgsGrassEditAttributes::mouseClick(QgsPoint & point, Qt::ButtonState button`
`799`	`801`
`800`	`802`	`if ( e->mAttributes )`
`801`	`803`	`{`
	`804`	`+ e->mAttributes->setLine ( 0 );`
`802`	`805`	`e->mAttributes->clear();`
`803`	`806`	`e->mAttributes->raise();`
`804`	`807`	`}`
`@@ -812,6 +815,10 @@ void QgsGrassEditAttributes::mouseClick(QgsPoint & point, Qt::ButtonState button`
`812`	`815`	`{`
`813`	`816`	`e->mAttributes = new QgsGrassAttributes ( e, e->mProvider, e->mSelectedLine, e->mQgisApp );`
`814`	`817`	`}`
	`818`	`+ else`
	`819`	`+ {`
	`820`	`+ e->mAttributes->setLine ( e->mSelectedLine );`
	`821`	`+ }`
`815`	`822`	`for ( int i = 0; i < e->mCats->n_cats; i++ ) {`
`816`	`823`	`e->addAttributes ( e->mCats->field[i], e->mCats->cat[i] );`
`817`	`824`	`}`