Changeset 7577

Timestamp:

05/12/08 12:32:27 (2 months ago)

Author:

tbonfort

Message:

use an agg specific label size calculation function where possible (#2357)

Files:

• trunk/mapserver/HISTORY.TXT (modified) (1 diff)
• trunk/mapserver/mapagg.cpp (modified) (1 diff)
• trunk/mapserver/mapdraw.c (modified) (2 diffs)
• trunk/mapserver/mapgraticule.c (modified) (1 diff)
• trunk/mapserver/mapimagemap.c (modified) (1 diff)
• trunk/mapserver/maplabel.c (modified) (4 diffs)
• trunk/mapserver/maplegend.c (modified) (2 diffs)
• trunk/mapserver/mapscale.c (modified) (5 diffs)
• trunk/mapserver/mapserver.h (modified) (2 diffs)
• trunk/mapserver/mapsvg.c (modified) (1 diff)

trunk/mapserver/HISTORY.TXT

@@ -13 +13 @@
-Current Version (5.1-dev, SVN trunk):
--------------------------------------
+- AGG: use an agg specific label size calculation function where possible (#2357)
-
-- mapogcsld.c: fetch TextSymbolizer/Label/ogc:PropertyName correctly (#2611)

trunk/mapserver/mapagg.cpp

@@ -1948 +1948 @@
-}
-
+int msGetLabelSizeAGG(imageObj *img, char *string, labelObj *label, rectObj *rect, fontSetObj *fontset, double scalefactor, int adjustBaseline)
+{
+    AGGMapserverRenderer* ren = getAGGRenderer(img);
+    int size;
+    size = MS_NINT(label->size*scalefactor);
+    size = MS_MAX(size, label->minsize);
+    size = MS_MIN(size, label->maxsize);
+    char * font = msLookupHashTable(&(fontset->fonts), label->font);
+    if(!font) {
+        msSetError(MS_TTFERR, "Requested font (%s) not found.", "msGetLabelSizeAGG()", label->font);
+        return MS_FAILURE;
+    }
+    if(ren->getLabelSize(string, font, label->size, rect) != MS_SUCCESS)
+        return MS_FAILURE;
+    if(adjustBaseline) {
+        label->offsety += MS_NINT(((rect->miny+rect->maxy) + size) / 2);
+        label->offsetx += MS_NINT(rect->minx / 2);
+    }
+    return MS_SUCCESS;
+}
-// ---------------------------------------------------------------------------
-// Draw a label curved along a line

trunk/mapserver/mapdraw.c

@@ -1956 +1956 @@
-    rectObj r;
-
-
+image,
-    p = get_metrics(&labelPnt, label->position, r, label->offsetx, label->offsety, label->angle, 0, NULL);
-    msDrawText(image, p, string, label, fontset, scalefactor); /* actually draw the label */
@@ -2087 +2087 @@
-                        continue; /* not an error, just don't want to do anything */
-
-
+image,
-                        return(-1);
-

trunk/mapserver/mapgraticule.c

@@ -656 +656 @@
-                msTransformShapeToPixel( pShape, pLayer->map->extent, pLayer->map->cellsize );
-
-
+GD
-        return MS_FAILURE;  /* msSetError already called */
-

trunk/mapserver/mapimagemap.c

@@ -1851 +1851 @@
-      cachePtr->label.size = (int)(cachePtr->label.size*layerPtr->scalefactor);
-
-
+img,
-      return(-1);
-

trunk/mapserver/maplabel.c

@@ -1 +1 @@
-/******************************************************************************
-:
+
- *
- * Project:  MapServer
@@ -397 +397 @@
-}
-
+
+int msGetLabelSize(imageObj *img, char *string, labelObj *label, rectObj *rect, fontSetObj *fontset, double scalefactor, int adjustBaseline)
+{
+#ifdef USE_AGG
+    if(MS_RENDERER_AGG(img->format))
+        return msGetLabelSizeAGG(img,string,label,rect,fontset,scalefactor,adjustBaseline);
+    else
+#endif
+        return msGetLabelSizeGD(string,label,rect,fontset,scalefactor,adjustBaseline);
+}
+
-/*
-** Note: All these routines assume a reference point at the LL corner of the text. GD's
@@ -404 +415 @@
-
-/* assumes an angle of 0 regardless of what's in the label object */
-
+GD
-{
-  int size;
@@ -803 +814 @@
-  label.antialias = symbol->antialias;
-  
-
+GD
-    return(-1);
-

trunk/mapserver/maplegend.c

@@ -201 +201 @@
-
-            if (   transformedText == NULL
-
+GD
-                                  &rect, &(map->fontset), 1.0, MS_FALSE) != 0)
-            { /* something bad happened */
@@ -310 +310 @@
-            head=cur;
-            if(cur->transformedText==NULL||
-
+GD
-            { /* something bad happened, free allocated mem */
-                while(cur) {

trunk/mapserver/mapscale.c

@@ -1 +1 @@
-/******************************************************************************
-:
+
- *
- * Project:  MapServer
@@ -311 +311 @@
-      p.x = ox + j*isx; /* + MS_NINT(fontPtr->w/2); */
-      p.y = oy + map->scalebar.height + MS_NINT(VSPACING*fontPtr->h);
-
+GD
-              &(map->fontset), 1, MS_FALSE) == -1) return(NULL);
-      p2 = get_metrics(&p, MS_CC, r, 0,0, 0, 0, NULL);
@@ -324 +324 @@
-    p.x = ox; /* + MS_NINT(fontPtr->w/2); */
-    p.y = oy + map->scalebar.height + MS_NINT(VSPACING*fontPtr->h);
-
+GD
-            &(map->fontset), 1, MS_FALSE) == -1) return(NULL);
-    p2 = get_metrics(&p, MS_CR, r, 0,0, 0, 0, NULL);
@@ -344 +344 @@
-      p.x = ox + j*isx; /* + MS_NINT(fontPtr->w/2); */
-      p.y = oy + map->scalebar.height + MS_NINT(VSPACING*fontPtr->h);
-
+GD
-              &(map->fontset), 1, MS_FALSE) == -1) return(NULL);
-      p2 = get_metrics(&p, MS_CC, r, 0,0, 0, 0, NULL);
@@ -360 +360 @@
-    p.x = ox; /* + MS_NINT(fontPtr->w/2); */
-    p.y = oy + map->scalebar.height + MS_NINT(VSPACING*fontPtr->h);
-
+GD
-            &(map->fontset), 1, MS_FALSE) == -1) return(NULL);
-    p2 = get_metrics(&p, MS_CR, r, 0,0, 0, 0, NULL);

trunk/mapserver/mapserver.h

@@ -1681 +1681 @@
-MS_DLL_EXPORT int msFreeFontSet(fontSetObj *fontset);
-MS_DLL_EXPORT char *msTransformLabelText(labelObj *label, char *text);
-
+
+
+
-MS_DLL_EXPORT int msGetLabelSizeEx(char *string, labelObj *label, rectObj *rect, fontSetObj *fontSet, double scalefactor, int adjustBaseline, double **offsets);
-MS_DLL_EXPORT int msAddLabel(mapObj *map, int layerindex, int classindex, int shapeindex, int tileindex, pointObj *point, labelPathObj *labelpath, char *string, double featuresize, labelObj *label);
@@ -1927 +1929 @@
-MS_DLL_EXPORT void msDrawShadeSymbolAGG(symbolSetObj *symbolset, imageObj *image,shapeObj *p, styleObj *style, double scalefactor);
-
+MS_DLL_EXPORT int msGetLabelSizeAGG(imageObj *img, char *string, labelObj *label, rectObj *rect, fontSetObj *fontSet, double scalefactor, int adjustBaseline);
-MS_DLL_EXPORT int msDrawTextAGG(imageObj *imgage, pointObj labelPnt, char *string, labelObj *label, fontSetObj *fontset, double scalefactor);
-MS_DLL_EXPORT int msDrawTextLineAGG(imageObj *image, char *string, labelObj *label, labelPathObj *labelpath, fontSetObj *fontset, double scalefactor);

trunk/mapserver/mapsvg.c

@@ -1153 +1153 @@
-      continue; /* not an error, just don't want to do anything */
-
-
+GD
-      return(-1);
-