[mapguide-commits] r1258 - trunk/MgDev/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Mar 16 14:03:09 EDT 2007
Author: waltweltonlair
Date: 2007-03-16 14:03:09 -0400 (Fri, 16 Mar 2007)
New Revision: 1258
Modified:
trunk/MgDev/Common/Stylization/RendererStyles.h
trunk/MgDev/Common/Stylization/SE_ExpressionBase.h
trunk/MgDev/Common/Stylization/SE_RenderProxies.h
trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h
Log:
Just cleanup
Modified: trunk/MgDev/Common/Stylization/RendererStyles.h
===================================================================
--- trunk/MgDev/Common/Stylization/RendererStyles.h 2007-03-16 18:02:46 UTC (rev 1257)
+++ trunk/MgDev/Common/Stylization/RendererStyles.h 2007-03-16 18:03:09 UTC (rev 1258)
@@ -100,6 +100,8 @@
RS_OverpostType_FirstFit
};
+
+//////////////////////////////////////////////////////////////////////////////
enum RS_ElevationType
{
RS_ElevationType_RelativeToGround,
@@ -108,6 +110,17 @@
//////////////////////////////////////////////////////////////////////////////
+enum LabelAlgo
+{
+ laSimple,
+ laCurve,
+ laSkeleton,
+ laPeriodicPolygon,
+ laSESymbol
+};
+
+
+//////////////////////////////////////////////////////////////////////////////
class RS_Color
{
public:
@@ -138,12 +151,12 @@
m_alpha = rgba & 0xFF;
}
- inline int & red() { return m_red; }
- inline int & green() { return m_green; }
- inline int & blue() { return m_blue; }
- inline int & alpha() { return m_alpha; }
+ inline int& red() { return m_red; }
+ inline int& green() { return m_green; }
+ inline int& blue() { return m_blue; }
+ inline int& alpha() { return m_alpha; }
- inline int argb() const
+ inline int argb() const
{
return ((m_alpha & 0xFF) << 24) |
((m_red & 0xFF) << 16) |
@@ -151,7 +164,7 @@
(m_blue & 0xFF);
}
- inline int abgr() const
+ inline int abgr() const
{
return ((m_alpha & 0xFF) << 24) |
((m_blue & 0xFF) << 16) |
@@ -162,10 +175,10 @@
static RS_Color FromARGB(unsigned int argb)
{
RS_Color ret;
- ret.m_alpha = (argb >> 24) & 0xFF;
- ret.m_red = (argb >> 16) & 0xFF;
- ret.m_green = (argb >> 8) & 0xFF;
- ret.m_blue = argb & 0xFF;
+ ret.m_alpha = (argb >> 24) & 0xFF;
+ ret.m_red = (argb >> 16) & 0xFF;
+ ret.m_green = (argb >> 8) & 0xFF;
+ ret.m_blue = argb & 0xFF;
return ret;
}
@@ -200,10 +213,10 @@
m_units = units;
}
- inline RS_Color & color() { return m_color; }
- inline double & width() { return m_width; }
- inline RS_String & style() { return m_style; }
- inline RS_Units & units() { return m_units; }
+ inline RS_Color& color() { return m_color; }
+ inline double& width() { return m_width; }
+ inline RS_String& style() { return m_style; }
+ inline RS_Units& units() { return m_units; }
private:
RS_Color m_color;
@@ -236,10 +249,10 @@
{
}
- inline RS_LineStroke & outline() { return m_outline; }
- inline RS_Color & color() { return m_color; }
- inline RS_Color & background() { return m_background; }
- inline RS_String& pattern() { return m_pattern; }
+ inline RS_LineStroke& outline() { return m_outline; }
+ inline RS_Color& color() { return m_color; }
+ inline RS_Color& background() { return m_background; }
+ inline RS_String& pattern() { return m_pattern; }
private:
RS_LineStroke m_outline;
@@ -272,10 +285,10 @@
{
}
- inline double & height() { return m_height; }
- inline RS_String & name() { return m_name; }
- inline RS_FontStyle_Mask & style() { return m_style; }
- inline RS_Units & units() { return m_units; }
+ inline double& height() { return m_height; }
+ inline RS_String& name() { return m_name; }
+ inline RS_FontStyle_Mask& style() { return m_style; }
+ inline RS_Units& units() { return m_units; }
private:
double m_height;
@@ -310,15 +323,15 @@
{
}
- inline RS_HAlignment & halign() { return m_halign; }
- inline RS_VAlignment & valign() { return m_valign; }
- inline RS_Justify & justify() { return m_justify; }
- inline RS_TextBackground & textbg() { return m_textbg; }
- inline RS_Color & color() { return m_color; }
- inline RS_Color & bgcolor() { return m_bgcolor; }
- inline RS_FontDef & font() { return m_font; }
- inline double & rotation() { return m_rotation; }
- inline double & linespace() { return m_linespace; }
+ inline RS_HAlignment& halign() { return m_halign; }
+ inline RS_VAlignment& valign() { return m_valign; }
+ inline RS_Justify& justify() { return m_justify; }
+ inline RS_TextBackground& textbg() { return m_textbg; }
+ inline RS_Color& color() { return m_color; }
+ inline RS_Color& bgcolor() { return m_bgcolor; }
+ inline RS_FontDef& font() { return m_font; }
+ inline double& rotation() { return m_rotation; }
+ inline double& linespace() { return m_linespace; }
private:
RS_HAlignment m_halign;
@@ -374,14 +387,14 @@
{
}
- inline double & width() { return m_width; }
- inline double & height() { return m_height; }
- inline double & insx() { return m_insx; }
- inline double & insy() { return m_insy; }
- inline double & rotation() { return m_rotation; }
- inline RS_String & name() { return m_name; }
- inline RS_String & library() { return m_library; }
- inline RS_Units & units() { return m_units; }
+ inline double& width() { return m_width; }
+ inline double& height() { return m_height; }
+ inline double& insx() { return m_insx; }
+ inline double& insy() { return m_insy; }
+ inline double& rotation() { return m_rotation; }
+ inline RS_String& name() { return m_name; }
+ inline RS_String& library() { return m_library; }
+ inline RS_Units& units() { return m_units; }
inline RS_FillStyle& style() { return m_style; }
inline RS_FontStyle_Mask& fontstyle() { return m_fontstyle; }
@@ -417,9 +430,9 @@
{
}
- inline unsigned char* & data() { return m_data; }
- inline int& length() { return m_length; }
- inline RS_String& label() { return m_label; }
+ inline unsigned char*& data() { return m_data; }
+ inline int& length() { return m_length; }
+ inline RS_String& label() { return m_label; }
private:
unsigned char* m_data;
@@ -427,6 +440,7 @@
RS_String m_label;
};
+
//////////////////////////////////////////////////////////////////////////////
class RS_ElevationSettings
{
@@ -450,18 +464,19 @@
{
}
- inline RS_String& zOffsetExpression() { return m_zOffsetExpression; }
- inline RS_String& zExtrusionExpression() { return m_zExtrusionExpression; }
- inline RS_ElevationType elevType() { return m_elevType; }
- inline double metersPerUnit() {return m_metersPerUnit; }
+ inline RS_String& zOffsetExpression() { return m_zOffsetExpression; }
+ inline RS_String& zExtrusionExpression() { return m_zExtrusionExpression; }
+ inline RS_ElevationType& elevType() { return m_elevType; }
+ inline double& metersPerUnit() { return m_metersPerUnit; }
private:
+ RS_String m_zOffsetExpression;
+ RS_String m_zExtrusionExpression;
RS_ElevationType m_elevType;
- RS_String m_zOffsetExpression;
- RS_String m_zExtrusionExpression;
- double m_metersPerUnit;
+ double m_metersPerUnit;
};
+
//////////////////////////////////////////////////////////////////////////////
class RS_LayerUIInfo
{
@@ -512,19 +527,19 @@
{
}
- inline RS_String& name() { return m_name; }
- inline RS_String& guid() { return m_guid; }
- inline bool& selectable() { return m_selectable; }
- inline bool& visible() { return m_visible; }
- inline bool& editable() { return m_editable; }
- inline bool& show() { return m_showInLegend; }
- inline bool& expand() { return m_expandInLegend; }
- inline RS_String& groupname() { return m_groupname; }
- inline RS_String& groupguid() { return m_groupguid; }
- inline double& zorder() { return m_zorder; }
- inline RS_UIGraphic& graphic() { return m_uiGraphic; }
- inline bool& hastooltips(){ return m_hastooltips; }
- inline bool& hashyperlinks(){ return m_hashyperlinks; }
+ inline RS_String& name() { return m_name; }
+ inline RS_String& guid() { return m_guid; }
+ inline bool& selectable() { return m_selectable; }
+ inline bool& visible() { return m_visible; }
+ inline bool& editable() { return m_editable; }
+ inline bool& show() { return m_showInLegend; }
+ inline bool& expand() { return m_expandInLegend; }
+ inline RS_String& groupname() { return m_groupname; }
+ inline RS_String& groupguid() { return m_groupguid; }
+ inline double& zorder() { return m_zorder; }
+ inline RS_UIGraphic& graphic() { return m_uiGraphic; }
+ inline bool& hastooltips() { return m_hastooltips; }
+ inline bool& hashyperlinks() { return m_hashyperlinks; }
private:
RS_String m_name;
@@ -572,12 +587,12 @@
{
}
- inline RS_String& session() { return m_session; }
- inline RS_String& name() { return m_name; }
- inline RS_String& guid() { return m_guid; }
- inline RS_String& coordsys() { return m_coordsys; }
- inline RS_String& units() { return m_units; }
- inline RS_Color& bgcolor() { return m_bgcolor; }
+ inline RS_String& session() { return m_session; }
+ inline RS_String& name() { return m_name; }
+ inline RS_String& guid() { return m_guid; }
+ inline RS_String& coordsys() { return m_coordsys; }
+ inline RS_String& units() { return m_units; }
+ inline RS_Color& bgcolor() { return m_bgcolor; }
private:
RS_String m_session;
@@ -614,7 +629,7 @@
m_propMappings.push_back(dispname);
}
- inline RS_String& name() { return m_name; }
+ inline RS_String& name() { return m_name; }
inline std::vector<RS_String>& mappings() { return m_propMappings; }
private:
@@ -651,12 +666,12 @@
{
}
- inline RS_TextDef& tdef() { return m_tdef; }
- inline double& x() { return m_x; }
- inline double& y() { return m_y; }
- inline double& dx() { return m_dx; }
- inline double& dy() { return m_dy; }
- inline RS_Units& dunits(){ return m_dunits; }
+ inline RS_TextDef& tdef() { return m_tdef; }
+ inline double& x() { return m_x; }
+ inline double& y() { return m_y; }
+ inline double& dx() { return m_dx; }
+ inline double& dy() { return m_dy; }
+ inline RS_Units& dunits() { return m_dunits; }
inline bool& advanced() { return m_advanced; }
private:
@@ -693,18 +708,4 @@
RS_F_Point(double d0, double d1) : x(d0), y(d1) {}
};
-
-//////////////////////////////////////////////////////////////////////////////
-enum LabelAlgo
-{
- laSimple,
- laCurve,
- laSkeleton,
- laPeriodicPolygon,
- laSESymbol
-};
-
-//////////////////////////////////////////////////////////////////////////////
-
-
#endif
Modified: trunk/MgDev/Common/Stylization/SE_ExpressionBase.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_ExpressionBase.h 2007-03-16 18:02:46 UTC (rev 1257)
+++ trunk/MgDev/Common/Stylization/SE_ExpressionBase.h 2007-03-16 18:03:09 UTC (rev 1258)
@@ -22,6 +22,8 @@
#include <string>
#include "FilterExecutor.h"
+
+//////////////////////////////////////////////////////////////////////////////
struct SE_Color
{
unsigned char b, g, r, a; // argb, but little endian
@@ -49,7 +51,7 @@
*((unsigned int*)this) = 0xff000000;
}
}
-
+
return *((unsigned int*)this);
}
@@ -58,12 +60,14 @@
SE_INLINE unsigned int& argb() { return (*(unsigned int*)this); }
};
+
+//////////////////////////////////////////////////////////////////////////////
struct SE_Double
{
double value;
FdoExpression* expression;
- SE_INLINE SE_Double() : expression(NULL),value(0.0) { }
+ SE_INLINE SE_Double() : value(0.0), expression(NULL) { }
SE_INLINE SE_Double(double d) : value(d), expression(NULL) { }
~SE_Double() { if (expression) expression->Release(); }
@@ -89,15 +93,17 @@
return value;
}
- SE_INLINE void operator=(double d) { value = d; }
+ SE_INLINE void operator=(double d) { value = d; }
};
+
+//////////////////////////////////////////////////////////////////////////////
struct SE_Integer
{
int value;
FdoExpression* expression;
- SE_INLINE SE_Integer() : expression(NULL), value(0) { }
+ SE_INLINE SE_Integer() : value(0), expression(NULL) { }
SE_INLINE SE_Integer(int i) : value(i), expression(NULL) { }
~SE_Integer() { if (expression) expression->Release(); }
@@ -123,15 +129,17 @@
return value;
}
- SE_INLINE void operator=(int i) { value = i; }
+ SE_INLINE void operator=(int i) { value = i; }
};
+
+//////////////////////////////////////////////////////////////////////////////
struct SE_Boolean
{
bool value;
FdoExpression* expression;
- SE_INLINE SE_Boolean() : expression(NULL), value(false) { }
+ SE_INLINE SE_Boolean() : value(false), expression(NULL) { }
SE_INLINE SE_Boolean(bool b) : value(b), expression(NULL) { }
~SE_Boolean() { if (expression) expression->Release(); }
@@ -160,13 +168,14 @@
SE_INLINE void operator=(bool b) { value = b; }
};
+
+//////////////////////////////////////////////////////////////////////////////
struct SE_String
{
const wchar_t* value;
FdoExpression* expression;
- SE_INLINE SE_String() : expression(NULL), value(NULL)
- {}
+ SE_INLINE SE_String() : value(NULL), expression(NULL) { }
SE_INLINE SE_String(const wchar_t* s) : expression(NULL)
{
if (s)
@@ -179,12 +188,12 @@
value = NULL;
}
- ~SE_String()
+ ~SE_String()
{
if (value)
delete[] value;
- if (expression)
- expression->Release();
+ if (expression)
+ expression->Release();
}
SE_INLINE const wchar_t* evaluate(RS_FilterExecutor* processor)
@@ -197,12 +206,10 @@
value = NULL;
}
- wchar_t* newValue = NULL;
-
try
{
expression->Process(processor);
- newValue = processor->GetStringResult();
+ value = processor->GetStringResult();
}
catch (FdoException* e)
{
@@ -212,11 +219,9 @@
// just return the stored expression
FdoString* exprValue = expression->ToString();
size_t len = wcslen(exprValue) + 1;
- newValue = new wchar_t[len];
- wcscpy(newValue, exprValue);
+ wchar_t* copy = new wchar_t[len];
+ value = wcscpy(copy, exprValue);
}
-
- value = newValue;
}
return value;
@@ -239,32 +244,36 @@
};
+//////////////////////////////////////////////////////////////////////////////
typedef std::pair<const wchar_t*, const wchar_t*> ParamId;
struct ParamCmpLess : std::binary_function<ParamId&, ParamId&, bool>
{
public:
- bool operator( ) (const ParamId& a, const ParamId& b) const
+ bool operator() (const ParamId& a, const ParamId& b) const
{
int symcmp = wcscmp(a.first, b.first);
if (symcmp == 0)
return wcscmp(a.second, b.second) < 0;
-
+
return symcmp < 0;
}
};
+
struct StrCmpLess : std::binary_function<const wchar_t*, const wchar_t*, bool>
{
public:
- bool operator( ) (const wchar_t* a, const wchar_t* b) const
+ bool operator() (const wchar_t* a, const wchar_t* b) const
{
return wcscmp(a, b) < 0;
}
};
+
+//////////////////////////////////////////////////////////////////////////////
typedef std::map<ParamId, const wchar_t*, ParamCmpLess> ParameterMap;
-typedef std::map<const wchar_t*, const wchar_t*, StrCmpLess> DefaultMap;
+typedef std::map<const wchar_t*, const wchar_t*, StrCmpLess> DefaultMap;
class SE_ExpressionBase
{
@@ -274,13 +283,13 @@
void ParseBooleanExpression(const MdfModel::MdfString& exprstr, SE_Boolean& val);
void ParseStringExpression(const MdfModel::MdfString& exprstr, SE_String& val);
void ParseColorExpression(const MdfModel::MdfString& exprstr, SE_Color& val);
-
+
void SetParameterValues(MdfModel::OverrideCollection* overrides);
void SetDefaultValues(MdfModel::SimpleSymbolDefinition* definition);
private:
void ReplaceParameters(const MdfModel::MdfString& exprstr, const wchar_t* fallback);
-
+
ParameterMap m_parameters;
DefaultMap m_defaults;
const wchar_t* m_symbol;
Modified: trunk/MgDev/Common/Stylization/SE_RenderProxies.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_RenderProxies.h 2007-03-16 18:02:46 UTC (rev 1257)
+++ trunk/MgDev/Common/Stylization/SE_RenderProxies.h 2007-03-16 18:03:09 UTC (rev 1258)
@@ -15,13 +15,13 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-
#ifndef SE_RENDERPROXIES_H
#define SE_RENDERPROXIES_H
#include "SE_Bounds.h"
#include "SE_LineBuffer.h"
+
enum SE_RenderPrimitiveType
{
SE_RenderPolylinePrimitive,
@@ -30,6 +30,7 @@
SE_RenderRasterPrimitive
};
+
enum SE_RenderStyleType
{
SE_RenderPointStyleType,
@@ -44,6 +45,7 @@
//
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
struct SE_RenderPrimitive
{
SE_RenderPrimitiveType type;
@@ -51,46 +53,50 @@
SE_Bounds* bounds;
};
+
struct SE_RenderPolyline : public SE_RenderPrimitive
{
+ SE_INLINE SE_RenderPolyline() { type = SE_RenderPolylinePrimitive; }
+ ~SE_RenderPolyline() { if (geometry) geometry->Free(); }
+
SE_LineBuffer* geometry;
double weight;
unsigned int color;
-
- SE_INLINE SE_RenderPolyline() { type = SE_RenderPolylinePrimitive; }
- ~SE_RenderPolyline() { if (geometry) geometry->Free(); }
};
+
struct SE_RenderPolygon : public SE_RenderPolyline
{
+ SE_INLINE SE_RenderPolygon() { type = SE_RenderPolygonPrimitive; }
+ ~SE_RenderPolygon() { }
+
unsigned int fill;
-
- SE_INLINE SE_RenderPolygon() { type = SE_RenderPolygonPrimitive; }
- ~SE_RenderPolygon() { }
};
+
struct SE_RenderText : public SE_RenderPrimitive
{
+ SE_INLINE SE_RenderText() { type = SE_RenderTextPrimitive; }
+
std::wstring text;
double position[2];
-
RS_TextDef tdef;
-
- SE_INLINE SE_RenderText() { type = SE_RenderTextPrimitive; }
};
-/* Caching, if any, is left to the implementor of SE_Renderer */
+
+// Caching, if any, is left to the implementor of SE_Renderer
struct SE_RenderRaster : public SE_RenderPrimitive
{
+ SE_INLINE SE_RenderRaster() : pngPtr(0), pngSize(0) { type = SE_RenderRasterPrimitive; }
+
const unsigned char* pngPtr;
int pngSize;
double position[2];
double extent[2];
double angle;
-
- SE_INLINE SE_RenderRaster() : pngPtr(0), pngSize(0) { type = SE_RenderRasterPrimitive; }
};
+
typedef std::vector<SE_RenderPrimitive*> SE_RenderPrimitiveList;
@@ -100,9 +106,10 @@
//
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
struct SE_RenderStyle
{
- SE_INLINE SE_RenderStyle(SE_RenderStyleType stype)
+ SE_INLINE SE_RenderStyle(SE_RenderStyleType stype)
: type(stype),
drawLast(false),
checkExclusionRegions(false),
@@ -140,11 +147,13 @@
bool addToExclusionRegions;
};
+
struct SE_RenderPointStyle : public SE_RenderStyle
{
SE_INLINE SE_RenderPointStyle() : SE_RenderStyle(SE_RenderPointStyleType) { }
};
+
struct SE_RenderLineStyle : public SE_RenderStyle
{
SE_INLINE SE_RenderLineStyle() : SE_RenderStyle(SE_RenderLineStyleType) { }
@@ -161,6 +170,7 @@
double vertexAngleLimit;
};
+
struct SE_RenderAreaStyle : public SE_RenderStyle
{
SE_INLINE SE_RenderAreaStyle() : SE_RenderStyle(SE_RenderAreaStyleType) { }
@@ -179,26 +189,21 @@
class SE_LabelInfo
{
public:
+ SE_INLINE SE_LabelInfo()
+ : x(0.0), y(0.0), dx(0.0), dy(0.0), dunits(RS_Units_Device), anglerad(0.0), symbol(NULL)
+ { }
+
+ SE_INLINE SE_LabelInfo (double _x, double _y, double _dx, double _dy, RS_Units _dunits, double _anglerad, SE_RenderStyle* _symbol)
+ : x(_x), y(_y), dx(_dx), dy(_dy), dunits(_dunits), anglerad(_anglerad), symbol(_symbol)
+ { }
+
SE_RenderStyle* symbol;
double x;
double y;
double dx;
double dy;
double anglerad;
- RS_Units dunits;
-
- SE_INLINE SE_LabelInfo() :
- x(0.0),
- y(0.0),
- dx(0.0),
- dy(0.0),
- anglerad(0.0),
- symbol(NULL)
- { }
-
- SE_INLINE SE_LabelInfo (double _x, double _y, double _dx, double _dy, RS_Units _dunits, double _anglerad, SE_RenderStyle* _symbol)
- : x(_x), y(_y), dx(_dx), dy(_dy), dunits(_dunits), anglerad(_anglerad), symbol(_symbol)
- { }
+ RS_Units dunits;
};
#endif
Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h 2007-03-16 18:02:46 UTC (rev 1257)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.h 2007-03-16 18:03:09 UTC (rev 1258)
@@ -15,17 +15,19 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-
#ifndef SE_SYMBOLDEFPROXIES_H
#define SE_SYMBOLDEFPROXIES_H
#include "SE_LineBuffer.h"
+
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
//
// SE_Primitives
//
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
enum SE_PrimitiveType
{
SE_PolylinePrimitive,
@@ -34,6 +36,7 @@
SE_RasterPrimitive
};
+
enum SE_StyleType
{
SE_PointStyleType,
@@ -63,15 +66,17 @@
~SE_Polyline() { geometry->Free(); }
};
+
struct SE_Polygon : public SE_Polyline
{
SE_Color fill;
- SE_INLINE SE_Polygon() { type = SE_PolygonPrimitive; weight = 0.0; }
+ SE_INLINE SE_Polygon() { type = SE_PolygonPrimitive; weight = 0.0; }
~SE_Polygon() { geometry->Free(); }
};
-/* Font/properties caching is left to the implementor of SE_Renderer */
+
+// Font/properties caching is left to the implementor of SE_Renderer
struct SE_Text : public SE_Primitive
{
SE_String textExpr;
@@ -92,6 +97,7 @@
SE_INLINE SE_Text() { type = SE_TextPrimitive; }
};
+
struct SE_Raster : public SE_Primitive
{
SE_String pngPath;
@@ -111,6 +117,7 @@
//
//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
struct SE_Style
{
SE_StyleType type;
@@ -131,6 +138,7 @@
}
};
+
struct SE_PointStyle : public SE_Style
{
SE_INLINE SE_PointStyle() : SE_Style(SE_PointStyleType) { }
@@ -140,6 +148,7 @@
SE_Double originOffset[2];
};
+
struct SE_LineStyle : public SE_Style
{
SE_INLINE SE_LineStyle() : SE_Style(SE_LineStyleType) { }
@@ -156,6 +165,7 @@
SE_Double vertexAngleLimit;
};
+
struct SE_AreaStyle : public SE_Style
{
SE_INLINE SE_AreaStyle() : SE_Style(SE_AreaStyleType) { }
@@ -194,12 +204,13 @@
}
};
+
struct SE_Rule
{
std::vector<SE_Symbolization*> symbolization;
RS_String legendLabel; // no expressions on this guy
FdoFilter* filter;
-
+
~SE_Rule()
{
if (filter) filter->Release();
@@ -211,5 +222,4 @@
}
};
-
#endif
More information about the mapguide-commits
mailing list