pal: registerFeature can return true/false to tell whether the registration was successful.

wonder · wonder · commit 01a2b38a0947 · 2009-07-05T11:38:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11026 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
@@ -305,9 +305,10 @@ namespace pal
 }
 #endif
 
-void Layer::registerFeature( const char *geom_id, PalGeometry *userGeom, double label_x, double label_y )
+bool Layer::registerFeature( const char *geom_id, PalGeometry *userGeom, double label_x, double label_y )
 {
   int j;
+  int part = 0;
 
   if ( geom_id && label_x >= 0 && label_y >= 0 )
   {
@@ -318,7 +319,7 @@ void Layer::registerFeature( const char *geom_id, PalGeometry *userGeom, double
     {
       modMutex->unlock();
       throw new PalException::FeatureExists();
-      return;
+      return false;
     }
 
     /* Split MULTI GEOM and Collection in simple geometries*/
@@ -328,7 +329,6 @@ void Layer::registerFeature( const char *geom_id, PalGeometry *userGeom, double
     LinkedList<Feat*> *finalQueue = splitGeom( the_geom, geom_id, true );
 
     int nGeom = finalQueue->size();
-    int part = 0;
 
     bool first_feat = true;
 
@@ -409,6 +409,8 @@ void Layer::registerFeature( const char *geom_id, PalGeometry *userGeom, double
     userGeom->releaseGeosGeometry( the_geom );
   }
   modMutex->unlock();
+
+  return (part > 0); // true if we've added something
 }
 
 
diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
@@ -277,8 +277,10 @@ namespace pal
        * @param userGeom user's geometry that implements the PalGeometry interface
        *
        * @throws PalException::FeatureExists
+       *
+       * @return true on success (i.e. valid geometry)
        */
-      void registerFeature( const char *geom_id, PalGeometry *userGeom, double label_x = -1, double label_y = -1 );
+      bool registerFeature( const char *geom_id, PalGeometry *userGeom, double label_x = -1, double label_y = -1 );
 
       // TODO implement
       //void unregisterFeature (const char *geom_id);

Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,10 @@ namespace pal`
`305`	`305`	`}`
`306`	`306`	`#endif`
`307`	`307`
`308`		`-void Layer::registerFeature( const char geom_id, PalGeometry userGeom, double label_x, double label_y )`
	`308`	`+bool Layer::registerFeature( const char geom_id, PalGeometry userGeom, double label_x, double label_y )`
`309`	`309`	`{`
`310`	`310`	`int j;`
	`311`	`+ int part = 0;`
`311`	`312`
`312`	`313`	`if ( geom_id && label_x >= 0 && label_y >= 0 )`
`313`	`314`	`{`
`@@ -318,7 +319,7 @@ void Layer::registerFeature( const char geom_id, PalGeometry userGeom, double`
`318`	`319`	`{`
`319`	`320`	`modMutex->unlock();`
`320`	`321`	`throw new PalException::FeatureExists();`
`321`		`- return;`
	`322`	`+ return false;`
`322`	`323`	`}`
`323`	`324`
`324`	`325`	`/* Split MULTI GEOM and Collection in simple geometries*/`
`@@ -328,7 +329,6 @@ void Layer::registerFeature( const char geom_id, PalGeometry userGeom, double`
`328`	`329`	`LinkedList<Feat> finalQueue = splitGeom( the_geom, geom_id, true );`
`329`	`330`
`330`	`331`	`int nGeom = finalQueue->size();`
`331`		`- int part = 0;`
`332`	`332`
`333`	`333`	`bool first_feat = true;`
`334`	`334`
`@@ -409,6 +409,8 @@ void Layer::registerFeature( const char geom_id, PalGeometry userGeom, double`
`409`	`409`	`userGeom->releaseGeosGeometry( the_geom );`
`410`	`410`	`}`
`411`	`411`	`modMutex->unlock();`
	`412`	`+`
	`413`	`+ return (part > 0); // true if we've added something`
`412`	`414`	`}`
`413`	`415`
`414`	`416`