[mapserver-commits] r7836 - trunk/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-07-30 10:05:53 -0400 (Wed, 30 Jul 2008)
New Revision: 7836

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapswf.c
Log:
SWF: Button names reflects the layer id and shape id (#2691)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-07-30 13:13:23 UTC (rev 7835)
+++ trunk/mapserver/HISTORY.TXT	2008-07-30 14:05:53 UTC (rev 7836)
@@ -12,6 +12,10 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- SWF: Button names reflects the layer id and shape id (#2691)
+
+- Support reading projection parameter for OGC filters (#2712)
+
 - Several enhancements to STYLEITEM AUTO support for labels (#2708) and
   TTF symbols (#2721) in OGR layers 
 

Modified: trunk/mapserver/mapswf.c
===================================================================
--- trunk/mapserver/mapswf.c	2008-07-30 13:13:23 UTC (rev 7835)
+++ trunk/mapserver/mapswf.c	2008-07-30 14:05:53 UTC (rev 7836)
@@ -1590,7 +1590,7 @@
             }
             if (oDisplay)
             {
-                sprintf(gszTmp, "button%d",((SWFObj *)image->img.swf)->nTmpCount);
+              sprintf(gszTmp, "button_%d_%d",nLayerIndex, nShapeIndex);
                 ((SWFObj *)image->img.swf)->nTmpCount++;
                 SWFDisplayItem_setName(oDisplay, gszTmp);
             }
@@ -1650,7 +1650,7 @@
             }
             if (oDisplay)
             {
-                sprintf(gszTmp, "button%d",((SWFObj *)image->img.swf)->nTmpCount);
+               sprintf(gszTmp, "button_%d_%d",nLayerIndex, nShapeIndex);
                 ((SWFObj *)image->img.swf)->nTmpCount++;
                 SWFDisplayItem_setName(oDisplay, gszTmp);
             }
@@ -1722,7 +1722,7 @@
 
             if (oDisplay)
             {
-                sprintf(gszTmp, "button%d",((SWFObj *)image->img.swf)->nTmpCount);
+                sprintf(gszTmp, "button_%d_%d",nLayerIndex, nShapeIndex);
                 ((SWFObj *)image->img.swf)->nTmpCount++;
                 SWFDisplayItem_setName(oDisplay, gszTmp);
             }
@@ -2016,7 +2016,7 @@
                                          nShapeIndex, width);
 	    StoreButton(oButton, image);
 	    oDisplay = SWFMovie_add(GetCurrentMovie(map, image), oButton);
-            sprintf(gszTmp, "button%d",((SWFObj *)image->img.swf)->nTmpCount);
+             sprintf(gszTmp, "button_%d_%d",nLayerIndex, nShapeIndex);
             ((SWFObj *)image->img.swf)->nTmpCount++;
             SWFDisplayItem_setName(oDisplay, gszTmp);
             
@@ -2158,7 +2158,7 @@
                                               nShapeIndex, width);
             StoreButton(oButton, image);
             oDisplay = SWFMovie_add(GetCurrentMovie(map, image), oButton);
-            sprintf(gszTmp, "button%d",((SWFObj *)image->img.swf)->nTmpCount);
+            sprintf(gszTmp, "button_%d_%d",nLayerIndex, nShapeIndex);
             ((SWFObj *)image->img.swf)->nTmpCount++;
             SWFDisplayItem_setName(oDisplay, gszTmp);
         }
@@ -2209,7 +2209,7 @@
                                                   nShapeIndex, width);
                 StoreButton(oButton, image);
 		oDisplay = SWFMovie_add(GetCurrentMovie(map, image), oButton);
-                sprintf(gszTmp, "button%d",((SWFObj *)image->img.swf)->nTmpCount);
+                 sprintf(gszTmp, "button_%d_%d",nLayerIndex, nShapeIndex);
                 ((SWFObj *)image->img.swf)->nTmpCount++;
                 SWFDisplayItem_setName(oDisplay, gszTmp);
             }