[mapguide-commits] r1279 - trunk/MgDev/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Mar 18 11:52:34 EDT 2007
Author: waltweltonlair
Date: 2007-03-18 11:52:28 -0400 (Sun, 18 Mar 2007)
New Revision: 1279
Modified:
trunk/MgDev/Common/Stylization/BooleanValue.h
trunk/MgDev/Common/Stylization/CSysTransformer.h
trunk/MgDev/Common/Stylization/Centroid.h
trunk/MgDev/Common/Stylization/DWFRSInputStream.h
trunk/MgDev/Common/Stylization/DWFRenderer.h
trunk/MgDev/Common/Stylization/DataValuePool.h
trunk/MgDev/Common/Stylization/DataValueStack.h
trunk/MgDev/Common/Stylization/DateTimeValue.h
trunk/MgDev/Common/Stylization/DoubleValue.h
trunk/MgDev/Common/Stylization/EMapRenderer.h
trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h
trunk/MgDev/Common/Stylization/EPlotRenderer.h
trunk/MgDev/Common/Stylization/FilterExecutor.h
trunk/MgDev/Common/Stylization/GDFillPatterns.h
trunk/MgDev/Common/Stylization/GeometryAdapter.cpp
trunk/MgDev/Common/Stylization/GeometryAdapter.h
trunk/MgDev/Common/Stylization/Int64Value.h
trunk/MgDev/Common/Stylization/KeyEncode.h
trunk/MgDev/Common/Stylization/KmlContent.cpp
trunk/MgDev/Common/Stylization/KmlContent.h
trunk/MgDev/Common/Stylization/KmlLineStyle.cpp
trunk/MgDev/Common/Stylization/KmlPolyStyle.cpp
trunk/MgDev/Common/Stylization/KmlRenderer.cpp
trunk/MgDev/Common/Stylization/KmlRenderer.h
trunk/MgDev/Common/Stylization/ObservationMesh.h
trunk/MgDev/Common/Stylization/PointAdapter.h
trunk/MgDev/Common/Stylization/PolygonAdapter.h
trunk/MgDev/Common/Stylization/PolylineAdapter.h
trunk/MgDev/Common/Stylization/RSBufferOutputStream.h
trunk/MgDev/Common/Stylization/RSDWFInputStream.h
trunk/MgDev/Common/Stylization/RSDWFOutputStream.h
trunk/MgDev/Common/Stylization/RS_ByteData.h
trunk/MgDev/Common/Stylization/RS_Font.h
trunk/MgDev/Common/Stylization/RS_FontEngine.h
trunk/MgDev/Common/Stylization/RS_InputStream.h
trunk/MgDev/Common/Stylization/RS_OutputStream.h
trunk/MgDev/Common/Stylization/RS_Raster.h
trunk/MgDev/Common/Stylization/RasterAdapter.h
trunk/MgDev/Common/Stylization/SE_IdentityJoin.cpp
trunk/MgDev/Common/Stylization/SE_IdentityJoin.h
trunk/MgDev/Common/Stylization/SE_MiterJoin.h
trunk/MgDev/Common/Stylization/SE_PiecewiseTransform.h
trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.h
trunk/MgDev/Common/Stylization/SE_Renderer.h
trunk/MgDev/Common/Stylization/SE_StyleVisitor.h
trunk/MgDev/Common/Stylization/StringValue.h
trunk/MgDev/Common/Stylization/Stylizer.h
trunk/MgDev/Common/Stylization/SymbolManager.h
trunk/MgDev/Common/Stylization/SymbolTrans.h
trunk/MgDev/Common/Stylization/complex_polygon_gd.h
Log:
minor cleanup
Modified: trunk/MgDev/Common/Stylization/BooleanValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/BooleanValue.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/BooleanValue.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -19,7 +19,6 @@
class BooleanValue : public DataValue
{
-
//let only the DataValuePool create and destroy DataValues
friend class DataValuePool;
private:
@@ -52,7 +51,6 @@
DataValueType GetType();
private:
-
bool m_value;
wchar_t* m_strValue;
};
Modified: trunk/MgDev/Common/Stylization/CSysTransformer.h
===================================================================
--- trunk/MgDev/Common/Stylization/CSysTransformer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/CSysTransformer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,7 +25,6 @@
class CSysTransformer
{
public:
-
//x and y coordinates of point to be transformed.
//Result will be stored in inputs which will be overwirtten
virtual void TransformPoint(double& x, double& y) = 0;
Modified: trunk/MgDev/Common/Stylization/Centroid.h
===================================================================
--- trunk/MgDev/Common/Stylization/Centroid.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/Centroid.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -15,13 +15,9 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-class LineBuffer;
-
class Centroid
{
-
public:
-
static bool PointInPolygon(double* pointData, int numPointData, int* contourSizes, int numContourSizes, double x, double y );
static double PolylineLength(double* pts, int numpts);
static double PolygonArea(double* pts, int numpts);
Modified: trunk/MgDev/Common/Stylization/DWFRSInputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/DWFRSInputStream.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/DWFRSInputStream.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -22,7 +22,6 @@
class DWFRSInputStream : public DWFInputStream
{
public:
-
DWFRSInputStream(RS_InputStream* in)
{
m_in = in;
@@ -48,6 +47,5 @@
}
private:
-
RS_InputStream* m_in;
};
Modified: trunk/MgDev/Common/Stylization/DWFRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/DWFRenderer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/DWFRenderer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -41,16 +41,16 @@
namespace DWFCore
{
-class DWFBufferOutputStream;
-class DWFBufferInputStream;
+ class DWFBufferOutputStream;
+ class DWFBufferInputStream;
}
namespace DWFToolkit
{
-class DWFDefinedObject;
-class DWFDefinedObjectInstance;
-class DWFObjectDefinitionResource;
-class DWFSection;
+ class DWFDefinedObject;
+ class DWFDefinedObjectInstance;
+ class DWFObjectDefinitionResource;
+ class DWFSection;
};
//holds W2D streams, and object data streams
Modified: trunk/MgDev/Common/Stylization/DataValuePool.h
===================================================================
--- trunk/MgDev/Common/Stylization/DataValuePool.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/DataValuePool.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -118,7 +118,6 @@
void RelinquishDataValue(DataValue* dv);
private:
-
void RelinquishBooleanValue(BooleanValue* dv);
void RelinquishStringValue(StringValue* dv);
void RelinquishDoubleValue(DoubleValue* dv);
Modified: trunk/MgDev/Common/Stylization/DataValueStack.h
===================================================================
--- trunk/MgDev/Common/Stylization/DataValueStack.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/DataValueStack.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -21,7 +21,6 @@
template <class T> class DataValueStack
{
public:
-
DataValueStack()
{
m_count = 0;
@@ -72,7 +71,6 @@
}
private:
-
void make_bigger()
{
if (m_data)
@@ -91,7 +89,6 @@
}
}
-
T** m_data;
size_t m_len;
size_t m_count;
Modified: trunk/MgDev/Common/Stylization/DateTimeValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/DateTimeValue.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/DateTimeValue.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -19,7 +19,6 @@
class DateTimeValue : public DataValue
{
-
//let only the DataValuePool create and destroy DataValues
friend class DataValuePool;
private:
@@ -52,8 +51,6 @@
DataValueType GetType();
private:
-
FdoDateTime m_value;
wchar_t* m_strValue;
-
};
Modified: trunk/MgDev/Common/Stylization/DoubleValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/DoubleValue.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/DoubleValue.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -43,7 +43,6 @@
bool IsLessThan(DataValue&v2);
bool IsLessThanOrEqualTo(DataValue&v2);
-
double GetAsDouble();
long long GetAsInt64();
wchar_t* GetAsString();
@@ -53,8 +52,6 @@
DataValueType GetType();
private:
-
double m_value;
wchar_t* m_strValue;
-
};
Modified: trunk/MgDev/Common/Stylization/EMapRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/EMapRenderer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/EMapRenderer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -19,12 +19,6 @@
#include <list>
//dwf declare
-namespace DWFToolkit { namespace DWFEMapExtension
-{
- class DWFEMapLayer;
- class DWFEMapLayerGroup;
-}}
-
namespace DWFCore
{
class DWFUUID;
@@ -33,11 +27,17 @@
namespace DWFToolkit
{
class DWFImageResource;
+
+ namespace DWFEMapExtension
+ {
+ class DWFEMapLayer;
+ class DWFEMapLayerGroup;
+ }
}
-using namespace DWFToolkit::DWFEMapExtension;
-using namespace DWFToolkit;
using namespace DWFCore;
+using namespace DWFToolkit;
+using namespace DWFToolkit::DWFEMapExtension;
typedef std::map<std::wstring, RS_LayerUIInfo> layerinfo_map;
@@ -46,12 +46,9 @@
///</summary>
class EMapRenderer : public DWFRenderer
{
-
public:
-
STYLIZATION_API EMapRenderer(const RS_String& filename,
- const RS_String& agentUri
- );
+ const RS_String& agentUri);
STYLIZATION_API virtual ~EMapRenderer();
@@ -59,20 +56,18 @@
///////////////////////////////////////////////////////////////////
// DWFRenderer overloads
//
- STYLIZATION_API virtual void StartLayer (RS_LayerUIInfo* legendInfo,
- RS_FeatureClassInfo* classInfo
- );
+ STYLIZATION_API virtual void StartLayer(RS_LayerUIInfo* legendInfo,
+ RS_FeatureClassInfo* classInfo);
- STYLIZATION_API virtual void EndLayer ();
+ STYLIZATION_API virtual void EndLayer();
- STYLIZATION_API virtual void StartMap( RS_MapUIInfo* mapInfo,
- RS_Bounds& extents,
- double mapScale,
- double dpi,
- double metersPerUnit,
- CSysTransformer* xformToLL = NULL
- );
+ STYLIZATION_API virtual void StartMap(RS_MapUIInfo* mapInfo,
+ RS_Bounds& extents,
+ double mapScale,
+ double dpi,
+ double metersPerUnit,
+ CSysTransformer* xformToLL = NULL);
STYLIZATION_API virtual void EndMap();
@@ -81,14 +76,12 @@
//
//adds a scale range to current layer
- STYLIZATION_API virtual void AddScaleRange (double min,
- double max,
- std::list<RS_UIGraphic>* uiGraphics
- );
+ STYLIZATION_API virtual void AddScaleRange(double min,
+ double max,
+ std::list<RS_UIGraphic>* uiGraphics);
//defines a layer group
- STYLIZATION_API virtual void AddLayerGroup( RS_LayerUIInfo& legendInfo
- );
+ STYLIZATION_API virtual void AddLayerGroup(RS_LayerUIInfo& legendInfo);
//adds a thumbnail graphic
//STYLIZATION_API virtual void AddUIGraphic();
Modified: trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/EMapUpdateRenderer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -19,10 +19,6 @@
#include <list>
//dwf declare
-namespace DWFToolkit { namespace DWFEMapExtension
-{
-}}
-
namespace DWFCore
{
class DWFUUID;
@@ -39,9 +35,9 @@
}
}
-using namespace DWFToolkit::DWFEMapExtension;
-using namespace DWFToolkit;
using namespace DWFCore;
+using namespace DWFToolkit;
+using namespace DWFToolkit::DWFEMapExtension;
typedef std::map<std::wstring, RS_LayerUIInfo> layerinfo_map;
typedef std::vector<RS_LayerUIInfo> layerinfo_list;
@@ -52,30 +48,25 @@
class EMapUpdateRenderer : public DWFRenderer
{
public:
+ STYLIZATION_API EMapUpdateRenderer(const RS_String& filename,
+ unsigned int sequenceId);
- STYLIZATION_API EMapUpdateRenderer( const RS_String& filename,
- unsigned int sequenceId
- );
-
STYLIZATION_API virtual ~EMapUpdateRenderer();
- STYLIZATION_API virtual void StartMap( RS_MapUIInfo* mapInfo,
- RS_Bounds& extents,
- double mapScale,
- double dpi,
- double metersPerUnit,
- CSysTransformer* xformToLL
- );
+ STYLIZATION_API virtual void StartMap(RS_MapUIInfo* mapInfo,
+ RS_Bounds& extents,
+ double mapScale,
+ double dpi,
+ double metersPerUnit,
+ CSysTransformer* xformToLL);
STYLIZATION_API virtual void EndMap();
- STYLIZATION_API virtual void StartLayer (RS_LayerUIInfo* legendInfo,
- RS_FeatureClassInfo* classInfo
+ STYLIZATION_API virtual void StartLayer(RS_LayerUIInfo* legendInfo,
+ RS_FeatureClassInfo* classInfo);
- );
+ STYLIZATION_API virtual void EndLayer();
- STYLIZATION_API virtual void EndLayer ();
-
STYLIZATION_API void AddLayerGroupInfo(RS_LayerUIInfo& legendInfo);
STYLIZATION_API void AddLayerInfo(RS_LayerUIInfo& legendInfo);
Modified: trunk/MgDev/Common/Stylization/EPlotRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/EPlotRenderer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/EPlotRenderer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -41,7 +41,6 @@
class EPlotRenderer : public DWFRenderer
{
public:
-
STYLIZATION_API EPlotRenderer(const RS_String& filename,
double pageWidth,
double pageHeight,
Modified: trunk/MgDev/Common/Stylization/FilterExecutor.h
===================================================================
--- trunk/MgDev/Common/Stylization/FilterExecutor.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/FilterExecutor.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -38,18 +38,14 @@
//beware: multiple non-virtual inheritance from GisIDisposable!!!
class RS_FilterExecutor : public FdoIFilterProcessor, public FdoIExpressionProcessor
{
-
public:
-
RS_FilterExecutor(RS_FeatureReader* featureReader);
virtual ~RS_FilterExecutor();
protected:
-
void Dispose();
public:
-
static RS_FilterExecutor* Create(RS_FeatureReader* featureReader);
void SetMapLayerInfo(const RS_String& session,
@@ -57,8 +53,6 @@
const RS_String& layerID,
const RS_String& featClass);
-public:
-
//--------------------------------------------------------------------
// FdoIFilterProcessor
//--------------------------------------------------------------------
@@ -95,8 +89,6 @@
virtual void ProcessGeometryValue(FdoGeometryValue& expr);
virtual void ProcessComputedIdentifier(FdoComputedIdentifier &);
-public:
-
//-----------------------------------------------------------------
// RS_FilterExecutor
//-----------------------------------------------------------------
@@ -109,7 +101,6 @@
wchar_t* GetStringResult();
private:
-
void ExecuteARGB(FdoFunction& function);
void ExecuteSession(FdoFunction& function);
void ExecuteMapName(FdoFunction& function);
Modified: trunk/MgDev/Common/Stylization/GDFillPatterns.h
===================================================================
--- trunk/MgDev/Common/Stylization/GDFillPatterns.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/GDFillPatterns.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -20,6 +20,5 @@
class GDFillPatterns
{
public:
-
static gdImagePtr CreatePatternBitmap(const wchar_t* name, int fgColor, int bgColor);
};
Modified: trunk/MgDev/Common/Stylization/GeometryAdapter.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/GeometryAdapter.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/GeometryAdapter.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -788,4 +788,3 @@
}
return true;
}
-
Modified: trunk/MgDev/Common/Stylization/GeometryAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/GeometryAdapter.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/GeometryAdapter.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -40,12 +40,10 @@
//-----------------------------------------------------------------------------
class GeometryAdapter
{
-
public:
GeometryAdapter(LineBufferPool*);
virtual ~GeometryAdapter();
-
virtual void Stylize(Renderer* /*renderer*/,
RS_FeatureReader* /*features*/,
RS_FilterExecutor* /*exec*/,
@@ -53,10 +51,9 @@
MdfModel::FeatureTypeStyle* /*style*/,
const MdfModel::MdfString* /*tooltip = NULL*/,
const MdfModel::MdfString* /*url = NULL*/,
- RS_ElevationSettings* /*elevSettings = NULL*/
- )
+ RS_ElevationSettings* /*elevSettings = NULL*/)
{
- };
+ }
virtual void AddLabel(double x,
double y,
@@ -66,45 +63,24 @@
RS_OverpostType type,
bool exclude,
Renderer* renderer,
- LineBuffer* lb
- );
+ LineBuffer* lb);
- bool EvalColor (const MdfModel::MdfString& expr,
- RS_Color& color);
+ bool EvalColor (const MdfModel::MdfString& expr, RS_Color& color);
+ bool ConvertLineThickness (const MdfModel::MdfString& expr, double& thickness);
+ bool ConvertStroke (MdfModel::Stroke* stroke, RS_LineStroke& rstroke);
+ bool ConvertStroke (MdfModel::LineSymbolization2D* lsym, RS_LineStroke& rstroke);
+ bool ConvertFill (MdfModel::AreaSymbolization2D* fill, RS_FillStyle& rsfill);
+ bool ConvertFill (MdfModel::Fill* fill, RS_FillStyle& rsfill);
+ bool ConvertMarkerDef (MdfModel::Symbol* marker, RS_MarkerDef& mdef);
+ bool ConvertTextDef (MdfModel::TextSymbol* text, RS_TextDef& tdef);
+ bool ConvertTextHAlign (const MdfModel::MdfString& halign, RS_HAlignment& rshalign);
+ bool ConvertTextVAlign (const MdfModel::MdfString& valign, RS_VAlignment& rsvalign);
- bool ConvertLineThickness (const MdfModel::MdfString& expr,
- double& thickness);
-
- bool ConvertStroke (MdfModel::Stroke* stroke,
- RS_LineStroke& rstroke);
-
- bool ConvertStroke (MdfModel::LineSymbolization2D* lsym,
- RS_LineStroke& rstroke);
-
- bool ConvertFill (MdfModel::AreaSymbolization2D* fill,
- RS_FillStyle& rsfill);
-
- bool ConvertFill (MdfModel::Fill* fill,
- RS_FillStyle& rsfill);
-
- bool ConvertMarkerDef (MdfModel::Symbol* marker,
- RS_MarkerDef& mdef);
-
- bool ConvertTextDef (MdfModel::TextSymbol* text,
- RS_TextDef& tdef);
-
- bool ConvertTextHAlign (const MdfModel::MdfString& halign,
- RS_HAlignment& rshalign);
-
- bool ConvertTextVAlign (const MdfModel::MdfString& valign,
- RS_VAlignment& rsvalign);
-
bool ExecFdoFilter(const MdfModel::MdfString* pExpression);
FdoExpression* ObtainFdoExpression(const MdfModel::MdfString* pExpression);
protected:
-
bool EvalDouble(const MdfModel::MdfString& expr, double& res);
bool EvalBoolean(const MdfModel::MdfString& expr, bool& res);
bool EvalString(const MdfModel::MdfString& exprstr, RS_String& res);
Modified: trunk/MgDev/Common/Stylization/Int64Value.h
===================================================================
--- trunk/MgDev/Common/Stylization/Int64Value.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/Int64Value.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -52,7 +52,6 @@
DataValueType GetType();
private:
-
long long m_value;
wchar_t* m_strValue;
};
Modified: trunk/MgDev/Common/Stylization/KeyEncode.h
===================================================================
--- trunk/MgDev/Common/Stylization/KeyEncode.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KeyEncode.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -27,14 +27,12 @@
class KeyEncode
{
public:
-
STYLIZATION_API KeyEncode();
STYLIZATION_API virtual ~KeyEncode();
STYLIZATION_API virtual const unsigned char* EncodeKey(RS_FeatureReader* reader);
private:
-
void WriteDouble(double d);
void WriteSingle(float f);
void WriteInt32(int i);
Modified: trunk/MgDev/Common/Stylization/KmlContent.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/KmlContent.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KmlContent.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -20,8 +20,6 @@
#include "KmlContent.h"
#include "UnicodeString.h"
-//using this in contructor
-#pragma warning(disable:4355)
//default constructor
KmlContent::KmlContent()
@@ -33,6 +31,7 @@
{
}
+
void KmlContent::StartDocument()
{
WriteString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -41,12 +40,14 @@
WriteString("<Document>");
}
+
void KmlContent::EndDocument()
{
WriteString("</Document>");
WriteString("</kml>");
}
+
void KmlContent::WriteString(const char* szString, int length, bool lineBreak)
{
m_content.sputn(szString, length);
@@ -56,16 +57,19 @@
}
}
+
void KmlContent::WriteString(const char* szString, bool lineBreak /*= true*/)
{
WriteString(szString, (std::streamsize)strlen(szString), lineBreak);
}
+
void KmlContent::WriteString(const std::string& mbString, bool lineBreak /*= true*/)
{
WriteString(mbString.c_str(), (std::streamsize)mbString.length(), lineBreak);
}
+
void KmlContent::WriteString(const wchar_t* wszString, bool lineBreak /*= true*/)
{
std::string mbString;
@@ -73,6 +77,7 @@
WriteString(mbString, lineBreak);
}
+
void KmlContent::WriteString(const std::wstring& wString, bool lineBreak /*= true*/)
{
std::string mbString;
@@ -80,8 +85,8 @@
WriteString(mbString, lineBreak);
}
+
std::string KmlContent::GetString()
{
return m_content.str();
}
-
Modified: trunk/MgDev/Common/Stylization/KmlContent.h
===================================================================
--- trunk/MgDev/Common/Stylization/KmlContent.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KmlContent.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -39,6 +39,7 @@
STYLIZATION_API void WriteString(const std::wstring& wString, bool lineBreak = true);
STYLIZATION_API std::string GetString();
+
private:
void WriteString(const char* szString, int length, bool lineBreak);
std::stringbuf m_content;
Modified: trunk/MgDev/Common/Stylization/KmlLineStyle.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/KmlLineStyle.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KmlLineStyle.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,6 +25,7 @@
{
}
+
bool KmlLineStyle::operator<(const KmlLineStyle& other) const
{
return (other.m_color < m_color || (other.m_color == m_color && other.m_width < m_width));
Modified: trunk/MgDev/Common/Stylization/KmlPolyStyle.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/KmlPolyStyle.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KmlPolyStyle.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -26,6 +26,7 @@
{
}
+
bool KmlPolyStyle::operator<(const KmlPolyStyle& other) const
{
return (other.m_lineColor < m_lineColor ||
Modified: trunk/MgDev/Common/Stylization/KmlRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/KmlRenderer.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KmlRenderer.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -57,6 +57,7 @@
ClearStyles();
}
+
void KmlRenderer::StartMap(RS_MapUIInfo* /*mapInfo*/,
RS_Bounds& /*extents*/,
double /*mapScale*/,
@@ -178,6 +179,7 @@
m_elevType = zOffsetType;
}
+
void KmlRenderer::WriteElevationSettings()
{
if(m_elevation == 0)
@@ -207,8 +209,8 @@
}
}
-void KmlRenderer::ProcessPolygon(LineBuffer* lb,
- RS_FillStyle& fill)
+
+void KmlRenderer::ProcessPolygon(LineBuffer* lb, RS_FillStyle& fill)
{
//write style
WriteStyle(fill);
@@ -268,6 +270,7 @@
}
}
+
void KmlRenderer::WriteLinearRing(double* points, int offset, int numPoints)
{
m_kmlContent->WriteString("<LinearRing>");
@@ -275,6 +278,7 @@
m_kmlContent->WriteString("</LinearRing>");
}
+
void KmlRenderer::WriteCoordinates(double* points, int offset, int numPoints)
{
char buffer[256];
@@ -289,8 +293,8 @@
m_kmlContent->WriteString("</coordinates>");
}
-void KmlRenderer::ProcessPolyline(LineBuffer* srclb,
- RS_LineStroke& lsym)
+
+void KmlRenderer::ProcessPolyline(LineBuffer* srclb, RS_LineStroke& lsym)
{
//write style
WriteStyle(lsym);
@@ -332,6 +336,7 @@
}
}
+
void KmlRenderer::ProcessOneMarker(double x, double y, RS_MarkerDef& mdef, bool /*allowOverpost*/)
{
char buffer[256];
@@ -347,10 +352,12 @@
m_kmlContent->WriteString("</Point>");
}
+
void KmlRenderer::ProcessLabel(double /*x*/, double /*y*/, const RS_String& /*text*/, RS_TextDef& /*tdef*/)
{
}
+
void KmlRenderer::ProcessLabelGroup(RS_LabelInfo* /*labels*/,
int /*nlabels*/,
const RS_String& text,
@@ -447,6 +454,7 @@
{
}
+
void KmlRenderer::ClearThemes()
{
for(ThemeMap::iterator iter = m_themeMap.begin(); iter != m_themeMap.end(); iter++)
@@ -456,6 +464,7 @@
m_themeMap.clear();
}
+
void KmlRenderer::ClearStyles()
{
if(m_styleContent != NULL)
@@ -465,6 +474,7 @@
}
}
+
void KmlRenderer::WriteStyle(RS_FillStyle& fill)
{
if(m_styleContent == NULL)
@@ -527,6 +537,7 @@
m_kmlContent->WriteString(buffer);
}
+
void KmlRenderer::WriteStyle(RS_LineStroke& lsym)
{
if(m_styleContent == NULL)
@@ -571,6 +582,7 @@
m_kmlContent->WriteString(buffer);
}
+
double KmlRenderer::_MeterToPixels(RS_Units unit, double number)
{
double scale_factor;
@@ -586,8 +598,3 @@
return number * scale_factor;
}
-
-
-
-
-
Modified: trunk/MgDev/Common/Stylization/KmlRenderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/KmlRenderer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/KmlRenderer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -41,7 +41,6 @@
class KmlRenderer : public Renderer
{
public:
-
STYLIZATION_API KmlRenderer(KmlContent* kmlContent, RS_Bounds& extents,
double scale, double dpi, double metersPerUnit, int drawOrder);
STYLIZATION_API ~KmlRenderer();
@@ -120,7 +119,6 @@
STYLIZATION_API virtual bool RequiresClipping();
private:
-
// Unimplemented Constructors/Methods
KmlRenderer(const KmlRenderer&);
KmlRenderer& operator=(const KmlRenderer&);
Modified: trunk/MgDev/Common/Stylization/ObservationMesh.h
===================================================================
--- trunk/MgDev/Common/Stylization/ObservationMesh.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/ObservationMesh.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,6 +25,7 @@
struct RS_Bounds;
class RS_OutputStream;
+
struct ObsPoint
{
double x;
@@ -33,6 +34,7 @@
double oy;
};
+
struct ObsFace
{
//indices into points array for the 3 points of
@@ -62,6 +64,7 @@
}
};
+
struct HullEdge
{
HullEdge(int p, int f)
@@ -92,7 +95,6 @@
class ObservationMesh
{
public:
-
STYLIZATION_API ObservationMesh(RS_Bounds& mapExtent, CSysTransformer* xformer);
STYLIZATION_API virtual ~ObservationMesh();
@@ -101,7 +103,6 @@
STYLIZATION_API void WriteXml(RS_OutputStream* os);
private:
-
bool PointInTriangle(double px, double py, ObsFace& f);
void ComputeCircle(ObsFace& f);
Modified: trunk/MgDev/Common/Stylization/PointAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/PointAdapter.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/PointAdapter.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -23,7 +23,6 @@
class PointAdapter : public GeometryAdapter
{
public:
-
PointAdapter(LineBufferPool*);
virtual ~PointAdapter();
@@ -37,11 +36,8 @@
RS_ElevationSettings* elevSettings = NULL
);
- void ObtainStyle( MdfModel::PointSymbolization2D* psym,
- RS_MarkerDef& mdef);
-
- std::map<void*, RS_MarkerDef*> m_hPointSymCache;
-
private:
+ void ObtainStyle(MdfModel::PointSymbolization2D* psym, RS_MarkerDef& mdef);
+ std::map<void*, RS_MarkerDef*> m_hPointSymCache;
};
Modified: trunk/MgDev/Common/Stylization/PolygonAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/PolygonAdapter.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/PolygonAdapter.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -23,7 +23,6 @@
class PolygonAdapter : public GeometryAdapter
{
public:
-
PolygonAdapter(LineBufferPool*);
virtual ~PolygonAdapter();
@@ -38,9 +37,7 @@
);
private:
+ void ObtainStyle(MdfModel::AreaSymbolization2D* asym, RS_FillStyle& fillStyle);
- void ObtainStyle( MdfModel::AreaSymbolization2D* asym,
- RS_FillStyle& fillStyle);
-
std::map<void*, RS_FillStyle*> m_hAreaSymCache;
};
Modified: trunk/MgDev/Common/Stylization/PolylineAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/PolylineAdapter.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/PolylineAdapter.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -23,7 +23,6 @@
class PolylineAdapter : public GeometryAdapter
{
public:
-
PolylineAdapter(LineBufferPool*);
virtual ~PolylineAdapter();
@@ -38,9 +37,7 @@
);
private:
+ void ObtainStyle(MdfModel::LineSymbolization2D* lsym, RS_LineStroke& lineStyle);
- void ObtainStyle( MdfModel::LineSymbolization2D* lsym,
- RS_LineStroke& lineStyle);
-
std::map<void*, RS_LineStroke*> m_hLineSymCache;
};
Modified: trunk/MgDev/Common/Stylization/RSBufferOutputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RSBufferOutputStream.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RSBufferOutputStream.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -52,8 +52,7 @@
// Writes at most nBytesToWrite to the stream into the buffer
// Returns the number of actual bytes written
//
- virtual size_t write( const void* pBuffer,
- size_t nBytesToWrite)
+ virtual size_t write(const void* pBuffer, size_t nBytesToWrite)
{
ensure_capacity(nBytesToWrite);
memcpy(m_data + m_pos, pBuffer, nBytesToWrite);
Modified: trunk/MgDev/Common/Stylization/RSDWFInputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RSDWFInputStream.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RSDWFInputStream.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -22,7 +22,6 @@
class RSDWFInputStream : public RS_InputStream
{
public:
-
RSDWFInputStream(DWFInputStream* in)
{
m_in = in;
@@ -37,17 +36,16 @@
return m_in->available();
}
- virtual size_t read( void* pBuffer, size_t nBytesToRead )
+ virtual size_t read(void* pBuffer, size_t nBytesToRead)
{
return m_in->read(pBuffer, nBytesToRead);
}
- virtual off_t seek( int eOrigin, off_t nOffset )
+ virtual off_t seek(int eOrigin, off_t nOffset)
{
return m_in->seek(eOrigin, nOffset);
}
private:
-
DWFInputStream* m_in;
};
Modified: trunk/MgDev/Common/Stylization/RSDWFOutputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RSDWFOutputStream.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RSDWFOutputStream.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -23,7 +23,6 @@
class RSDWFOutputStream : public RS_OutputStream
{
public:
-
RSDWFOutputStream(DWFOutputStream* out)
{
m_out = out;
@@ -38,14 +37,11 @@
m_out->flush();
}
- virtual size_t write( const void* pBuffer,
- size_t nBytesToWrite
- )
+ virtual size_t write(const void* pBuffer, size_t nBytesToWrite)
{
return m_out->write(pBuffer, nBytesToWrite);
}
private:
-
DWFOutputStream* m_out;
};
Modified: trunk/MgDev/Common/Stylization/RS_ByteData.h
===================================================================
--- trunk/MgDev/Common/Stylization/RS_ByteData.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RS_ByteData.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -20,7 +20,7 @@
class RS_ByteData
{
- public :
+ public:
STYLIZATION_API RS_ByteData();
STYLIZATION_API RS_ByteData(unsigned char* bytes, unsigned int numBytes);
STYLIZATION_API ~RS_ByteData();
@@ -29,7 +29,7 @@
STYLIZATION_API unsigned char* GetBytes();
STYLIZATION_API unsigned int GetNumBytes();
- private :
+ private:
unsigned char* m_bytes;
unsigned int m_numBytes;
};
Modified: trunk/MgDev/Common/Stylization/RS_Font.h
===================================================================
--- trunk/MgDev/Common/Stylization/RS_Font.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RS_Font.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,9 +25,7 @@
struct RS_Font
{
- public :
-
- public :
+ public:
RS_Font(void) :
m_bold(false),
m_italic(false),
@@ -48,7 +46,6 @@
}
public:
-
//font style
bool m_bold;
bool m_italic;
Modified: trunk/MgDev/Common/Stylization/RS_FontEngine.h
===================================================================
--- trunk/MgDev/Common/Stylization/RS_FontEngine.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RS_FontEngine.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -116,7 +116,7 @@
double MeterToMapSize(RS_Units unit, double number);
double MetersToPixels(RS_Units unit, double number);
- bool _Yup()
+ bool _Yup()
{
return m_bYup;
}
Modified: trunk/MgDev/Common/Stylization/RS_InputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RS_InputStream.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RS_InputStream.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,11 +25,10 @@
class RS_InputStream
{
public:
-
//
// Destructor
//
- virtual ~RS_InputStream() {;}
+ virtual ~RS_InputStream() {}
//
// Returns the number of bytes available to read from stream
@@ -40,27 +39,21 @@
// Reads at most nBytesToRead from the stream into the buffer
// Returns the number of actual bytes read
//
- virtual size_t read(void* pBuffer,
- size_t nBytesToRead
- ) = 0;
+ virtual size_t read(void* pBuffer, size_t nBytesToRead) = 0;
//
// Repositions the stream pointer
// Returns the previous offset before the seek
//
- virtual off_t seek( int eOrigin,
- off_t nOffset
- ) = 0;
+ virtual off_t seek(int eOrigin, off_t nOffset) = 0;
protected:
-
//
// Default constructor
//
- RS_InputStream() {;}
+ RS_InputStream() {}
private:
-
//
// Unimplemented methods
//
Modified: trunk/MgDev/Common/Stylization/RS_OutputStream.h
===================================================================
--- trunk/MgDev/Common/Stylization/RS_OutputStream.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RS_OutputStream.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -20,13 +20,11 @@
class RS_OutputStream
{
-
public:
-
//
// Destructor
//
- virtual ~RS_OutputStream() {;}
+ virtual ~RS_OutputStream() {}
//
// Flushes any remaining bytes from the stream
@@ -37,26 +35,21 @@
// Writes at most nBytesToWrite to the stream into the buffer
// Returns the number of actual bytes read
//
- virtual size_t write( const void* pBuffer,
- size_t nBytesToWrite
- )= 0;
+ virtual size_t write(const void* pBuffer, size_t nBytesToWrite) = 0;
protected:
-
//
// Default constructor
//
- RS_OutputStream() {;}
+ RS_OutputStream() {}
private:
-
//
// Unimplemented methods
//
RS_OutputStream( const RS_OutputStream& );
RS_OutputStream& operator=( const RS_OutputStream& );
-
};
#endif
Modified: trunk/MgDev/Common/Stylization/RS_Raster.h
===================================================================
--- trunk/MgDev/Common/Stylization/RS_Raster.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RS_Raster.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,7 +25,6 @@
class RS_Raster
{
public:
-
RS_Raster() {};
virtual ~RS_Raster() {};
@@ -39,11 +38,7 @@
virtual RS_InputStream* GetPalette() = 0;
- virtual RS_InputStream* GetStream(RS_ImageFormat format,
- int width,
- int height
- ) = 0;
-
+ virtual RS_InputStream* GetStream(RS_ImageFormat format, int width, int height) = 0;
};
#endif
Modified: trunk/MgDev/Common/Stylization/RasterAdapter.h
===================================================================
--- trunk/MgDev/Common/Stylization/RasterAdapter.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/RasterAdapter.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -20,7 +20,6 @@
class RasterAdapter : public GeometryAdapter
{
public:
-
RasterAdapter(LineBufferPool*);
virtual ~RasterAdapter();
@@ -35,14 +34,10 @@
);
void DecodeRGBA(RS_InputStream* is, unsigned char* dst, int w, int h);
-
void DecodeRGB(RS_InputStream* is, unsigned char* dst, int w, int h);
-
void DecodeMapped(RS_InputStream* is, RS_InputStream* pal, unsigned char* dst, int w, int h);
-
void DecodeBitonal(RS_InputStream* is, const RS_Color& fg, const RS_Color& bg, unsigned char* dst, int w, int h);
protected:
-
RS_FilterExecutor* m_exec;
};
Modified: trunk/MgDev/Common/Stylization/SE_IdentityJoin.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_IdentityJoin.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_IdentityJoin.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -90,4 +90,4 @@
info->d2Xdxdy = 0.0;
info->d2Ydxdy = 0.0;
}
-}
\ No newline at end of file
+}
Modified: trunk/MgDev/Common/Stylization/SE_IdentityJoin.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_IdentityJoin.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_IdentityJoin.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -37,6 +37,7 @@
virtual double GetXChop(bool &chopEnd);
virtual void Transform(double& x, double &y, SE_TransformInfo* info);
+
private:
double m_chop;
bool m_end;
Modified: trunk/MgDev/Common/Stylization/SE_MiterJoin.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_MiterJoin.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_MiterJoin.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -25,7 +25,6 @@
class SE_MiterJoin : public SE_PiecewiseTransform
{
public:
-
SE_MiterJoin(double limit, /* The miter limit of the join. */
RS_Bounds& bounds, /* The bounds of the unoriented symbol in pixel units. */
double vertexOffset, /* The distance along the line (in pixels) from the
Modified: trunk/MgDev/Common/Stylization/SE_PiecewiseTransform.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PiecewiseTransform.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_PiecewiseTransform.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -34,6 +34,7 @@
double d2Ydxdy;
};
+
class SE_PiecewiseTransform
{
public:
Modified: trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.cpp 2007-03-18 15:52:28 UTC (rev 1279)
@@ -1,3 +1,19 @@
+//
+// Copyright (C) 2007 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
#include "stdafx.h"
#include "SE_RenderProxies.h"
@@ -22,6 +38,7 @@
return ret;
}
+
//recomputes the bounds of an SE_RenderPointStyle that contains a text
//whose alignment we have messed with
void UpdateStyleBounds(SE_RenderPointStyle* st, SE_Renderer* renderer)
@@ -74,6 +91,7 @@
st->bounds->max[1] = rotatedBounds.maxy;
}
+
void SE_PositioningAlgorithms::EightSurrounding(SE_Renderer* renderer,
LineBuffer* geometry,
SE_Matrix& xform,
@@ -297,7 +315,6 @@
//a linestring or multi line string feature, with stitching of adjacent features that have the
//same label
-
//assume that a single text was used in the SymbolDefinition that requests this positioning algorithm
SE_RenderText* rt = (SE_RenderText*)rstyle->symbol[0];
@@ -309,7 +326,6 @@
}
-
void SE_PositioningAlgorithms::MultipleHighwaysShields(SE_Renderer* renderer,
LineBuffer* geometry,
SE_Matrix& xform,
@@ -318,10 +334,4 @@
double mm2px
)
{
-
-
-
-
}
-
-
Modified: trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_PositioningAlgorithms.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -1,5 +1,25 @@
+//
+// Copyright (C) 2007 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+#ifndef SE_POSITIONINGALGORITHMS_H
+#define SE_POSITIONINGALGORITHMS_H
+
+class LineBuffer;
class SE_Renderer;
-class SE_LineBuffer;
struct SE_Matrix;
struct SE_Style;
struct SE_RenderStyle;
@@ -7,9 +27,7 @@
class SE_PositioningAlgorithms
{
-
public:
-
static void EightSurrounding(SE_Renderer* renderer,
LineBuffer* geometry,
SE_Matrix& xform,
@@ -33,13 +51,6 @@
SE_RenderStyle* rstyle,
double mm2px
);
+};
-private:
-
-
-
-
-
-
-
-};
+#endif // SE_POSITIONINGALGORITHMS_H
Modified: trunk/MgDev/Common/Stylization/SE_Renderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -73,7 +73,6 @@
void AddExclusionRegion(SE_RenderStyle* rstyle, SE_Matrix& xform, double angle);
RS_F_Point m_lastExclusionRegion[4];
-
protected:
SE_LineBufferPool* m_lbp;
Modified: trunk/MgDev/Common/Stylization/SE_StyleVisitor.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_StyleVisitor.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SE_StyleVisitor.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -52,6 +52,7 @@
SE_AreaStyle* ProcessAreaUsage(MdfModel::AreaUsage& areaUsage);
void Convert(std::vector<SE_Symbolization*>& styles, MdfModel::CompositeSymbolization* symbolization);
+
private:
SE_Style* ParseSymbol(MdfModel::CompoundSymbolDefinition* symbol);
bool ParseDouble(const wchar_t*& str, double& val);
Modified: trunk/MgDev/Common/Stylization/StringValue.h
===================================================================
--- trunk/MgDev/Common/Stylization/StringValue.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/StringValue.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -19,7 +19,6 @@
class StringValue : public DataValue
{
-
//let only the DataValuePool create and destroy DataValues
friend class DataValuePool;
private:
@@ -52,7 +51,6 @@
DataValueType GetType();
private:
-
wchar_t* m_value;
bool m_bDisposeValue;
};
Modified: trunk/MgDev/Common/Stylization/Stylizer.h
===================================================================
--- trunk/MgDev/Common/Stylization/Stylizer.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/Stylizer.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -49,8 +49,7 @@
RS_FeatureReader* features,
CSysTransformer* xformer,
CancelStylization cancel,
- void* userData
- ) = 0;
+ void* userData) = 0;
///<summary>
/// Stylizes a grid/raster layer.
@@ -60,8 +59,7 @@
RS_FeatureReader* features,
CSysTransformer* xformer,
CancelStylization cancel,
- void* userData
- ) = 0;
+ void* userData) = 0;
///<summary>
/// Stylizes a drawing (DWF-based) layer.
@@ -71,8 +69,7 @@
RS_LayerUIInfo* legendInfo,
RS_InputStream* dwfin,
const RS_String& layerFilter,
- CSysTransformer* xformer
- ) = 0;
+ CSysTransformer* xformer) = 0;
///<summary>
/// Allows a user to set a custom stylization object for certain geometry types.
Modified: trunk/MgDev/Common/Stylization/SymbolManager.h
===================================================================
--- trunk/MgDev/Common/Stylization/SymbolManager.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SymbolManager.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -26,10 +26,8 @@
class RS_SymbolManager
{
public:
-
virtual const RS_InputStream* GetSymbolData(const wchar_t* libraryName,
- const wchar_t* symbolName
- ) = 0;
+ const wchar_t* symbolName) = 0;
};
Modified: trunk/MgDev/Common/Stylization/SymbolTrans.h
===================================================================
--- trunk/MgDev/Common/Stylization/SymbolTrans.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/SymbolTrans.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -28,9 +28,7 @@
///</summary>
class SymbolTrans : public CSysTransformer
{
-
-public :
-
+public:
STYLIZATION_API SymbolTrans();
STYLIZATION_API SymbolTrans(RS_Bounds& src, RS_Bounds& dst, double refX, double refY, double angle);
@@ -55,7 +53,6 @@
STYLIZATION_API void SetDstBounds(const RS_Bounds& dst);
private:
-
RS_Bounds m_src;
RS_Bounds m_dst;
double m_refX;
Modified: trunk/MgDev/Common/Stylization/complex_polygon_gd.h
===================================================================
--- trunk/MgDev/Common/Stylization/complex_polygon_gd.h 2007-03-18 05:50:44 UTC (rev 1278)
+++ trunk/MgDev/Common/Stylization/complex_polygon_gd.h 2007-03-18 15:52:28 UTC (rev 1279)
@@ -1,3 +1,19 @@
+//
+// Copyright (C) 2004-2007 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
#ifndef complex_polygon_gd_H
#define complex_polygon_gd_H
@@ -16,7 +32,6 @@
void FillPolygon(Point * VertexList, int nVerts, int* Contours, int nContours, int Color, gdImagePtr target);
private:
-
//This is what you want to implement for your own render target
//for all the rest of the code to work with it
inline void DrawHorizontalLineSeg(int Y, int StartX, int EndX, int Color, gdImagePtr target)
@@ -35,7 +50,6 @@
struct EdgeState *m_GETPtr, *m_AETPtr;
EdgeState* m_bufEdgeState;
size_t m_nBufEdgeState;
-
};
#endif
More information about the mapguide-commits
mailing list