[mapguide-commits] r7030 - in branches/maestro-4.0.x: Maestro Maestro.Editors/LayerDefinition/Vector/Thematics

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-09-18 06:18:05 -0700 (Tue, 18 Sep 2012)
New Revision: 7030

Modified:
   branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
   branches/maestro-4.0.x/Maestro/changelog.txt
Log:
#2126: Use layer filter (if specified) when generating theme rules.

Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt	2012-09-18 13:13:12 UTC (rev 7029)
+++ branches/maestro-4.0.x/Maestro/changelog.txt	2012-09-18 13:18:05 UTC (rev 7030)
@@ -1,5 +1,6 @@
 4.0.3
 -----
+ - Theme generation now considers active layer filter when generating rules
  - Use UNIQUE() for fetching distinct values in Expression Editor
  - Fusion editor fixes
    - OSM support

Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs	2012-09-18 13:13:12 UTC (rev 7029)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs	2012-09-18 13:18:05 UTC (rev 7030)
@@ -228,6 +228,8 @@
                     try
                     {
                         IVectorLayerDefinition vl = (IVectorLayerDefinition)m_layer.SubLayer;
+                        if (!string.IsNullOrEmpty(vl.Filter))
+                            filter = vl.Filter;
                         try
                         {
                             //Either UNIQUE() is an undocumented FDO expression function (!!!)