[mapguide-commits] r4353 - in trunk/MgDev/Common: Renderers
Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Nov 22 00:32:27 EST 2009
Author: waltweltonlair
Date: 2009-11-22 00:32:25 -0500 (Sun, 22 Nov 2009)
New Revision: 4353
Modified:
trunk/MgDev/Common/Renderers/KmlRenderer.cpp
trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
trunk/MgDev/Common/Stylization/SE_RenderProxies.h
trunk/MgDev/Common/Stylization/SE_Renderer.cpp
trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp
trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h
trunk/MgDev/Common/Stylization/StylizationEngine.cpp
Log:
Keep variable names consistent with the schema names:
* AddToExclusionRegion
* CheckExclusionRegion
Modified: trunk/MgDev/Common/Renderers/KmlRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/KmlRenderer.cpp 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Renderers/KmlRenderer.cpp 2009-11-22 05:32:25 UTC (rev 4353)
@@ -764,7 +764,7 @@
RS_FillStyle fs;
RS_MarkerDef mdef(RS_MarkerType_Marker, 1.0, 1.0, 0.5, 0.5, 0.0, RS_Units_Device, SLDType_Square, L"", L"", fs);
- ProcessMarker(ctx->geometry, mdef, !style->addToExclusionRegions, bounds);
+ ProcessMarker(ctx->geometry, mdef, !style->addToExclusionRegion, bounds);
}
Modified: trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp 2009-11-22 05:32:25 UTC (rev 4353)
@@ -473,7 +473,7 @@
SE_RenderText* rt = (SE_RenderText*)rstyle->symbol[0];
RS_LabelInfo info(0.0, 0.0, 0.0, 0.0, RS_Units_Device, rt->tdef);
- return se_renderer->ProcessLabelGroup(&info, 1, rt->content, RS_OverpostType_AllFit, rstyle->addToExclusionRegions, geometry, 0.5);
+ return se_renderer->ProcessLabelGroup(&info, 1, rt->content, RS_OverpostType_AllFit, rstyle->addToExclusionRegion, geometry, 0.5);
}
se_renderer->ProcessLineLabels(geometry, (SE_RenderLineStyle*)rstyle);
@@ -716,14 +716,14 @@
SE_RenderStyle* clonedStyle = se_renderer->CloneRenderStyle(rlStyle);
SE_LabelInfo info(symxf.x2, symxf.y2, RS_Units_Device, angleRad, clonedStyle);
- se_renderer->ProcessSELabelGroup(&info, 1, RS_OverpostType_AllFit, rlStyle->addToExclusionRegions, geometry);
+ se_renderer->ProcessSELabelGroup(&info, 1, RS_OverpostType_AllFit, rlStyle->addToExclusionRegion, geometry);
}
else
{
se_renderer->DrawSymbol(symbolVectors[shieldIndex], symxf, angleRad);
// TODO: if this is ever needed ...
-// if (rlStyle->addToExclusionRegions)
+// if (rlStyle->addToExclusionRegion)
// se_renderer->AddExclusionRegion(style, symxf, 0.0);
}
Modified: trunk/MgDev/Common/Stylization/SE_RenderProxies.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_RenderProxies.h 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/SE_RenderProxies.h 2009-11-22 05:32:25 UTC (rev 4353)
@@ -173,8 +173,8 @@
: type(stype),
renderPass(0),
drawLast(false),
- checkExclusionRegions(false),
- addToExclusionRegions(false)
+ checkExclusionRegion(false),
+ addToExclusionRegion(false)
{
bounds[0].x = bounds[3].x = +DBL_MAX;
bounds[1].x = bounds[2].x = -DBL_MAX;
@@ -218,8 +218,8 @@
int renderPass;
bool drawLast;
- bool checkExclusionRegions;
- bool addToExclusionRegions;
+ bool checkExclusionRegion;
+ bool addToExclusionRegion;
};
Modified: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.cpp 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.cpp 2009-11-22 05:32:25 UTC (rev 4353)
@@ -214,7 +214,7 @@
if (style->drawLast)
AddLabel(featGeom, style, xform, angleRad);
else
- DrawSymbol(style->symbol, xform, angleRad, style->addToExclusionRegions);
+ DrawSymbol(style->symbol, xform, angleRad, style->addToExclusionRegion);
}
if (bounds)
@@ -371,7 +371,7 @@
{
xform = xformbase;
xform.translate(pos->x, pos->y);
- DrawSymbol(style->symbol, xform, baserot, style->addToExclusionRegions);
+ DrawSymbol(style->symbol, xform, baserot, style->addToExclusionRegion);
}
LineBufferPool::FreeLineBuffer(m_pPool, spLB.release());
@@ -488,7 +488,7 @@
SE_RenderStyle* clonedStyle = CloneRenderStyle(style);
SE_LabelInfo info(xform.x2, xform.y2, RS_Units_Device, angleRad, clonedStyle);
- ProcessSELabelGroup(&info, 1, RS_OverpostType_AllFit, style->addToExclusionRegions, geom);
+ ProcessSELabelGroup(&info, 1, RS_OverpostType_AllFit, style->addToExclusionRegion, geom);
}
@@ -566,10 +566,10 @@
// copy all the common properties
memcpy(ret->bounds, symbol->bounds, sizeof(ret->bounds));
- ret->addToExclusionRegions = symbol->addToExclusionRegions;
- ret->checkExclusionRegions = symbol->checkExclusionRegions;
- ret->drawLast = symbol->drawLast;
- ret->renderPass = symbol->renderPass;
+ ret->addToExclusionRegion = symbol->addToExclusionRegion;
+ ret->checkExclusionRegion = symbol->checkExclusionRegion;
+ ret->drawLast = symbol->drawLast;
+ ret->renderPass = symbol->renderPass;
// copy the graphics for the symbol
for (size_t i=0; i<symbol->symbol.size(); ++i)
@@ -1201,7 +1201,7 @@
// only draw symbols at the interior points
if (numDrawn > 0 && numDrawn < numSymbols-1)
- DrawSymbol(style->symbol, symxf, angleRad, style->addToExclusionRegions);
+ DrawSymbol(style->symbol, symxf, angleRad, style->addToExclusionRegion);
// handle the centerline path at the group's end - only
// need to do this if we have at least one interior symbol
@@ -1633,7 +1633,7 @@
if (style->drawLast)
AddLabel(geometry, style, symxf, angleRad);
else
- DrawSymbol(style->symbol, symxf, angleRad, style->addToExclusionRegions);
+ DrawSymbol(style->symbol, symxf, angleRad, style->addToExclusionRegion);
}
++numDrawn;
Modified: trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/SE_StyleVisitor.cpp 2009-11-22 05:32:25 UTC (rev 4353)
@@ -847,8 +847,8 @@
ParseStringExpression(instance->GetPositioningAlgorithm(), m_symbolInstance->positioningAlgorithm, SymbolInstance::sPositioningAlgorithmDefault, SymbolInstance::sPositioningAlgorithmValues);
ParseBooleanExpression(instance->GetDrawLast(), m_symbolInstance->drawLast, false);
- ParseBooleanExpression(instance->GetAddToExclusionRegion(), m_symbolInstance->addToExclusionRegions, false);
- ParseBooleanExpression(instance->GetCheckExclusionRegion(), m_symbolInstance->checkExclusionRegions, false);
+ ParseBooleanExpression(instance->GetAddToExclusionRegion(), m_symbolInstance->addToExclusionRegion, false);
+ ParseBooleanExpression(instance->GetCheckExclusionRegion(), m_symbolInstance->checkExclusionRegion, false);
ParseDoubleExpression(instance->GetScaleX(), m_symbolInstance->scale[0], 1.0);
ParseDoubleExpression(instance->GetScaleY(), m_symbolInstance->scale[1], 1.0);
Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp 2009-11-22 05:32:25 UTC (rev 4353)
@@ -892,7 +892,7 @@
if (rplist.size() == 1
&& rplist[0]->type == SE_RenderPrimitive_Polyline
&& !style->drawLast
- && !style->addToExclusionRegions)
+ && !style->addToExclusionRegion)
{
SE_RenderPolyline* rp = (SE_RenderPolyline*)rplist[0];
LineBuffer* lb = rp->geometry->xf_buffer();
@@ -1004,7 +1004,7 @@
if (rplist.size() == 1
&& rplist[0]->type == SE_RenderPrimitive_Polygon
&& !style->drawLast
- && !style->addToExclusionRegions)
+ && !style->addToExclusionRegion)
{
SE_RenderPolygon* rp = (SE_RenderPolygon*)rplist[0];
LineBuffer* lb = rp->geometry->xf_buffer();
Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h 2009-11-22 05:32:25 UTC (rev 4353)
@@ -262,8 +262,8 @@
MdfModel::SizeContext sizeContext;
MdfModel::SymbolInstance::GeometryContext geomContext;
SE_Boolean drawLast;
- SE_Boolean checkExclusionRegions;
- SE_Boolean addToExclusionRegions;
+ SE_Boolean checkExclusionRegion;
+ SE_Boolean addToExclusionRegion;
SE_String positioningAlgorithm;
SE_Integer renderPass;
Modified: trunk/MgDev/Common/Stylization/StylizationEngine.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/StylizationEngine.cpp 2009-11-22 04:51:35 UTC (rev 4352)
+++ trunk/MgDev/Common/Stylization/StylizationEngine.cpp 2009-11-22 05:32:25 UTC (rev 4353)
@@ -649,8 +649,8 @@
}
// TODO: why are these in the symbol instance?
- style->rstyle->addToExclusionRegions = sym->addToExclusionRegions.evaluate(exec);
- style->rstyle->checkExclusionRegions = sym->checkExclusionRegions.evaluate(exec);
+ style->rstyle->addToExclusionRegion = sym->addToExclusionRegion.evaluate(exec);
+ style->rstyle->checkExclusionRegion = sym->checkExclusionRegion.evaluate(exec);
style->rstyle->drawLast = sym->drawLast.evaluate(exec);
const wchar_t* positioningAlgo = sym->positioningAlgorithm.evaluate(exec);
More information about the mapguide-commits
mailing list