[mapguide-commits] r1374 - trunk/MgDev/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Mar 26 05:43:10 EDT 2007
Author: waltweltonlair
Date: 2007-03-26 05:42:53 -0400 (Mon, 26 Mar 2007)
New Revision: 1374
Modified:
trunk/MgDev/Common/Stylization/SE_Renderer.cpp
trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
Log:
Image extents must be positive, unless you don't want your images to draw...
Modified: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.cpp 2007-03-26 05:50:01 UTC (rev 1373)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.cpp 2007-03-26 09:42:53 UTC (rev 1374)
@@ -187,21 +187,21 @@
for (int i = 0; i < geometry->point_count(); i++)
{
double x = geometry->points()[2*i];
- double y= geometry->points()[2*i+1];
+ double y = geometry->points()[2*i+1];
//transform to screen space -- geometry is in [the original] mapping space
WorldToScreenPoint(x, y, x, y);
xform.setIdentity();
xform.translate(x, y);
- double angle = 0;//TODO: angle needs to be added to the RenderPointStyle
+ double angle = 0.0; //TODO: angle needs to be added to the RenderPointStyle
if (style->drawLast)
- AddLabel(geometry, style, xform, 0);
+ AddLabel(geometry, style, xform, 0.0);
else
{
DrawSymbol(style->symbol, xform, angle);
- double angle = 0;
+ double angle = 0.0;
if (style->addToExclusionRegions)
AddExclusionRegion(style, xform, angle);
}
Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp 2007-03-26 05:50:01 UTC (rev 1373)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp 2007-03-26 09:42:53 UTC (rev 1374)
@@ -254,13 +254,13 @@
if (extentScaleable.evaluate(cxt->exec))
{
- ret->extent[0] = extent[0].evaluate(cxt->exec)*cxt->xform->x0;
- ret->extent[1] = extent[1].evaluate(cxt->exec)*cxt->xform->y1;
+ ret->extent[0] = fabs(extent[0].evaluate(cxt->exec)*cxt->xform->x0);
+ ret->extent[1] = fabs(extent[1].evaluate(cxt->exec)*cxt->xform->y1);
}
else
{
- ret->extent[0] = extent[0].evaluate(cxt->exec)*cxt->mm2pxw;
- ret->extent[1] = extent[1].evaluate(cxt->exec)*cxt->mm2pxw;
+ ret->extent[0] = fabs(extent[0].evaluate(cxt->exec)*cxt->mm2pxw);
+ ret->extent[1] = fabs(extent[1].evaluate(cxt->exec)*cxt->mm2pxw);
}
ret->angle = angle.evaluate(cxt->exec) * M_PI180;
More information about the mapguide-commits
mailing list