[mapguide-commits] r7749 - sandbox/jng/stylization_refactor/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Aug 9 03:32:51 PDT 2013
Author: jng
Date: 2013-08-09 03:32:51 -0700 (Fri, 09 Aug 2013)
New Revision: 7749
Modified:
sandbox/jng/stylization_refactor/Common/Stylization/DefaultStylizer.cpp
sandbox/jng/stylization_refactor/Common/Stylization/LabelRenderer.cpp
sandbox/jng/stylization_refactor/Common/Stylization/LabelRendererLocal.cpp
sandbox/jng/stylization_refactor/Common/Stylization/SE_PositioningAlgorithms.cpp
sandbox/jng/stylization_refactor/Common/Stylization/StylizationEngine.cpp
sandbox/jng/stylization_refactor/Common/Stylization/StylizationUtil.cpp
Log:
More FdoGeometryType to GeometryType enum replacements
Modified: sandbox/jng/stylization_refactor/Common/Stylization/DefaultStylizer.cpp
===================================================================
--- sandbox/jng/stylization_refactor/Common/Stylization/DefaultStylizer.cpp 2013-08-09 10:22:24 UTC (rev 7748)
+++ sandbox/jng/stylization_refactor/Common/Stylization/DefaultStylizer.cpp 2013-08-09 10:32:51 UTC (rev 7749)
@@ -326,7 +326,7 @@
++nFeatures;
#endif
- LineBuffer* lb = LineBufferPool::NewLineBuffer(&m_lbPool, 8, FdoDimensionality_Z, ignoreZ);
+ LineBuffer* lb = LineBufferPool::NewLineBuffer(&m_lbPool, 8, Dimensionality_Z, ignoreZ);
if (!lb)
continue;
@@ -487,35 +487,35 @@
// otherwise need to create one based on the geometry type
switch (geomType)
{
- case FdoGeometryType_LineString:
- m_hGeomStylizers[FdoGeometryType_LineString] = new PolylineAdapter(&m_lbPool);
+ case GeometryType_LineString:
+ m_hGeomStylizers[GeometryType_LineString] = new PolylineAdapter(&m_lbPool);
break;
- case FdoGeometryType_MultiLineString:
- m_hGeomStylizers[FdoGeometryType_MultiLineString] = new PolylineAdapter(&m_lbPool);
+ case GeometryType_MultiLineString:
+ m_hGeomStylizers[GeometryType_MultiLineString] = new PolylineAdapter(&m_lbPool);
break;
- case FdoGeometryType_CurveString:
- m_hGeomStylizers[FdoGeometryType_CurveString] = new PolylineAdapter(&m_lbPool);
+ case GeometryType_CurveString:
+ m_hGeomStylizers[GeometryType_CurveString] = new PolylineAdapter(&m_lbPool);
break;
- case FdoGeometryType_MultiCurveString:
- m_hGeomStylizers[FdoGeometryType_MultiCurveString] = new PolylineAdapter(&m_lbPool);
+ case GeometryType_MultiCurveString:
+ m_hGeomStylizers[GeometryType_MultiCurveString] = new PolylineAdapter(&m_lbPool);
break;
- case FdoGeometryType_Polygon:
- m_hGeomStylizers[FdoGeometryType_Polygon] = new PolygonAdapter(&m_lbPool);
+ case GeometryType_Polygon:
+ m_hGeomStylizers[GeometryType_Polygon] = new PolygonAdapter(&m_lbPool);
break;
- case FdoGeometryType_MultiPolygon:
- m_hGeomStylizers[FdoGeometryType_MultiPolygon] = new PolygonAdapter(&m_lbPool);
+ case GeometryType_MultiPolygon:
+ m_hGeomStylizers[GeometryType_MultiPolygon] = new PolygonAdapter(&m_lbPool);
break;
- case FdoGeometryType_CurvePolygon:
- m_hGeomStylizers[FdoGeometryType_CurvePolygon] = new PolygonAdapter(&m_lbPool);
+ case GeometryType_CurvePolygon:
+ m_hGeomStylizers[GeometryType_CurvePolygon] = new PolygonAdapter(&m_lbPool);
break;
- case FdoGeometryType_MultiCurvePolygon:
- m_hGeomStylizers[FdoGeometryType_MultiCurvePolygon] = new PolygonAdapter(&m_lbPool);
+ case GeometryType_MultiCurvePolygon:
+ m_hGeomStylizers[GeometryType_MultiCurvePolygon] = new PolygonAdapter(&m_lbPool);
break;
- case FdoGeometryType_Point:
- m_hGeomStylizers[FdoGeometryType_Point] = new PointAdapter(&m_lbPool);
+ case GeometryType_Point:
+ m_hGeomStylizers[GeometryType_Point] = new PointAdapter(&m_lbPool);
break;
- case FdoGeometryType_MultiPoint:
- m_hGeomStylizers[FdoGeometryType_MultiPoint] = new PointAdapter(&m_lbPool);
+ case GeometryType_MultiPoint:
+ m_hGeomStylizers[GeometryType_MultiPoint] = new PointAdapter(&m_lbPool);
break;
default :
break;
Modified: sandbox/jng/stylization_refactor/Common/Stylization/LabelRenderer.cpp
===================================================================
--- sandbox/jng/stylization_refactor/Common/Stylization/LabelRenderer.cpp 2013-08-09 10:22:24 UTC (rev 7748)
+++ sandbox/jng/stylization_refactor/Common/Stylization/LabelRenderer.cpp 2013-08-09 10:32:51 UTC (rev 7749)
@@ -87,11 +87,11 @@
double scaleLimit)
{
// get the geometry type
- int geomType = (path != NULL)? path->geom_type() : FdoGeometryType_None;
+ int geomType = (path != NULL)? path->geom_type() : GeometryType_None;
// in the case of linear geometry we'll label along the path, so prepare
// for that (transform to screen space, group into stitch groups)
- if (geomType == FdoGeometryType_LineString || geomType == FdoGeometryType_MultiLineString)
+ if (geomType == GeometryType_LineString || geomType == GeometryType_MultiLineString)
{
BeginOverpostGroup(type, true, exclude);
Modified: sandbox/jng/stylization_refactor/Common/Stylization/LabelRendererLocal.cpp
===================================================================
--- sandbox/jng/stylization_refactor/Common/Stylization/LabelRendererLocal.cpp 2013-08-09 10:22:24 UTC (rev 7748)
+++ sandbox/jng/stylization_refactor/Common/Stylization/LabelRendererLocal.cpp 2013-08-09 10:32:51 UTC (rev 7749)
@@ -175,7 +175,7 @@
offset += lblpathpts;
}
}
- else if (geomType == FdoGeometryType_Polygon || geomType == FdoGeometryType_MultiPolygon)
+ else if (geomType == GeometryType_Polygon || geomType == GeometryType_MultiPolygon)
{
// we only expect one label info per polygon to be passed in from stylization
_ASSERT(nlabels == 1);
@@ -376,8 +376,7 @@
//////////////////////////////////////////////////////////////////////////////
void LabelRendererLocal::BlastLabels()
{
- try
- {
+ STYLIZATION_TRY()
//-------------------------------------------------------
// step 1 - perform stitching
//-------------------------------------------------------
Modified: sandbox/jng/stylization_refactor/Common/Stylization/SE_PositioningAlgorithms.cpp
===================================================================
--- sandbox/jng/stylization_refactor/Common/Stylization/SE_PositioningAlgorithms.cpp 2013-08-09 10:22:24 UTC (rev 7748)
+++ sandbox/jng/stylization_refactor/Common/Stylization/SE_PositioningAlgorithms.cpp 2013-08-09 10:32:51 UTC (rev 7749)
@@ -178,8 +178,8 @@
// eight surrounding labeling only applies to point feature geometry
switch (geometry->geom_type())
{
- case FdoGeometryType_Point:
- case FdoGeometryType_MultiPoint:
+ case GeometryType_Point:
+ case GeometryType_MultiPoint:
break;
default:
@@ -466,10 +466,10 @@
// path labeling only applies to linestring feature geometry
switch (geometry->geom_type())
{
- case FdoGeometryType_LineString:
- case FdoGeometryType_MultiLineString:
- case FdoGeometryType_CurveString:
- case FdoGeometryType_MultiCurveString:
+ case GeometryType_LineString:
+ case GeometryType_MultiLineString:
+ case GeometryType_CurveString:
+ case GeometryType_MultiCurveString:
break;
default:
Modified: sandbox/jng/stylization_refactor/Common/Stylization/StylizationEngine.cpp
===================================================================
--- sandbox/jng/stylization_refactor/Common/Stylization/StylizationEngine.cpp 2013-08-09 10:22:24 UTC (rev 7748)
+++ sandbox/jng/stylization_refactor/Common/Stylization/StylizationEngine.cpp 2013-08-09 10:32:51 UTC (rev 7749)
@@ -135,7 +135,7 @@
nFeatures++;
#endif
- LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pool, 8, FdoDimensionality_Z, ignoreZ);
+ LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pool, 8, Dimensionality_Z, ignoreZ);
if (!lb)
continue;
@@ -466,7 +466,7 @@
for (size_t posIx=0; posIx<nPos; posIx+=2)
{
//Get geometry
- LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pool, 8, FdoDimensionality_Z);
+ LineBuffer* lb = LineBufferPool::NewLineBuffer(m_pool, 8, Dimensionality_Z);
spLB.reset(lb);
lb->MoveTo(watermarkPosList[posIx], watermarkPosList[posIx+1]);
// tell line buffer the current drawing scale (used for arc tessellation)
@@ -951,29 +951,29 @@
{
switch (geometry->geom_type())
{
- case FdoGeometryType_Point:
- case FdoGeometryType_MultiPoint:
+ case GeometryType_Point:
+ case GeometryType_MultiPoint:
if (sym->geomContext != SymbolInstance::gcPoint)
continue;
break;
- case FdoGeometryType_LineString:
- case FdoGeometryType_MultiLineString:
- case FdoGeometryType_CurveString:
- case FdoGeometryType_MultiCurveString:
+ case GeometryType_LineString:
+ case GeometryType_MultiLineString:
+ case GeometryType_CurveString:
+ case GeometryType_MultiCurveString:
if (sym->geomContext != SymbolInstance::gcLineString)
continue;
break;
- case FdoGeometryType_Polygon:
- case FdoGeometryType_MultiPolygon:
- case FdoGeometryType_CurvePolygon:
- case FdoGeometryType_MultiCurvePolygon:
+ case GeometryType_Polygon:
+ case GeometryType_MultiPolygon:
+ case GeometryType_CurvePolygon:
+ case GeometryType_MultiCurvePolygon:
if (sym->geomContext != SymbolInstance::gcPolygon)
continue;
break;
-// case FdoGeometryType_MultiGeometry:
+// case GeometryType_MultiGeometry:
// continue;
// break;
}
@@ -1113,29 +1113,29 @@
{
switch (geometry->geom_type())
{
- case FdoGeometryType_Point:
- case FdoGeometryType_MultiPoint:
+ case GeometryType_Point:
+ case GeometryType_MultiPoint:
if (sym->geomContext != SymbolInstance::gcPoint)
continue;
break;
- case FdoGeometryType_LineString:
- case FdoGeometryType_MultiLineString:
- case FdoGeometryType_CurveString:
- case FdoGeometryType_MultiCurveString:
+ case GeometryType_LineString:
+ case GeometryType_MultiLineString:
+ case GeometryType_CurveString:
+ case GeometryType_MultiCurveString:
if (sym->geomContext != SymbolInstance::gcLineString)
continue;
break;
- case FdoGeometryType_Polygon:
- case FdoGeometryType_MultiPolygon:
- case FdoGeometryType_CurvePolygon:
- case FdoGeometryType_MultiCurvePolygon:
+ case GeometryType_Polygon:
+ case GeometryType_MultiPolygon:
+ case GeometryType_CurvePolygon:
+ case GeometryType_MultiCurvePolygon:
if (sym->geomContext != SymbolInstance::gcPolygon)
continue;
break;
-// case FdoGeometryType_MultiGeometry:
+// case GeometryType_MultiGeometry:
// continue;
// break;
}
Modified: sandbox/jng/stylization_refactor/Common/Stylization/StylizationUtil.cpp
===================================================================
--- sandbox/jng/stylization_refactor/Common/Stylization/StylizationUtil.cpp 2013-08-09 10:22:24 UTC (rev 7748)
+++ sandbox/jng/stylization_refactor/Common/Stylization/StylizationUtil.cpp 2013-08-09 10:32:51 UTC (rev 7749)
@@ -723,7 +723,7 @@
case SymbolInstance::gcLineString:
{
// a horizontal line centered vertically in the preview image
- lb.SetGeometryType(FdoGeometryType_LineString);
+ lb.SetGeometryType(GeometryType_LineString);
lb.MoveTo(x , y + 0.5*height);
lb.LineTo(x + width, y + 0.5*height);
break;
@@ -732,7 +732,7 @@
case SymbolInstance::gcPolygon:
{
// a rectangle around the border of the preview image
- lb.SetGeometryType(FdoGeometryType_LineString);
+ lb.SetGeometryType(GeometryType_LineString);
lb.MoveTo(x , y );
lb.LineTo(x + width, y );
lb.LineTo(x + width, y + height);
@@ -764,7 +764,7 @@
{
// set the preview geometry to a rectangle filling the preview image
LineBuffer lb(5);
- lb.SetGeometryType(FdoGeometryType_Polygon);
+ lb.SetGeometryType(GeometryType_Polygon);
lb.MoveTo(x , y );
lb.LineTo(x + width, y );
lb.LineTo(x + width, y + height);
More information about the mapguide-commits
mailing list