[fusion-commits] r2131 - trunk/widgets/Theme/classes

[svn_fusion at osgeo.org]

Author: liuar
Date: 2010-04-05 21:59:47 -0400 (Mon, 05 Apr 2010)
New Revision: 2131

Modified:
   trunk/widgets/Theme/classes/theme.php
Log:
Fixed ticket #386 Theme: The layer only geometric type = MgFeatureGeometricType::Surface is listed for Theme

Modified: trunk/widgets/Theme/classes/theme.php
===================================================================
--- trunk/widgets/Theme/classes/theme.php	2010-04-05 15:21:24 UTC (rev 2130)
+++ trunk/widgets/Theme/classes/theme.php	2010-04-06 01:59:47 UTC (rev 2131)
@@ -63,7 +63,14 @@
 
                 if($propDef->GetPropertyType() == MgFeaturePropertyType::GeometricProperty)
                 {
-                    if ($propDef->GetGeometryTypes() == MgFeatureGeometricType::Surface)
+                    if ($propDef->GetGeometryTypes() == MgFeatureGeometricType::Surface || 
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Point | MgFeatureGeometricType::Surface) ||
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Curve | MgFeatureGeometricType::Surface) ||
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Solid | MgFeatureGeometricType::Surface) ||
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Point | MgFeatureGeometricType::Curve | MgFeatureGeometricType::Surface) ||
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Point | MgFeatureGeometricType::Solid | MgFeatureGeometricType::Surface) ||
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Curve | MgFeatureGeometricType::Solid | MgFeatureGeometricType::Surface) ||
+                        $propDef->GetGeometryTypes() == (MgFeatureGeometricType::Point | MgFeatureGeometricType::Curve | MgFeatureGeometricType::Solid | MgFeatureGeometricType::Surface))
                     {
                         $layerNames[$layer->GetName()] = $layer->GetLegendLabel();
                     }