[mapguide-commits] r6086 - in trunk/MgDev/Common: MdfModel
MdfParser Schema
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Aug 22 11:11:16 EDT 2011
Author: waltweltonlair
Date: 2011-08-22 08:11:15 -0700 (Mon, 22 Aug 2011)
New Revision: 6086
Modified:
trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.h
trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.h
trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.h
trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.h
trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.h
trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.h
trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.cpp
trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.h
trunk/MgDev/Common/MdfModel/ProfileResult.cpp
trunk/MgDev/Common/MdfModel/ProfileResult.h
trunk/MgDev/Common/MdfModel/ScaleRange.cpp
trunk/MgDev/Common/MdfModel/ScaleRange.h
trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.h
trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.h
trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.h
trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.h
trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.h
trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.h
trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.h
trunk/MgDev/Common/MdfParser/IOProfileResult.cpp
trunk/MgDev/Common/MdfParser/IOProfileResult.h
trunk/MgDev/Common/MdfParser/IOScaleRange.cpp
trunk/MgDev/Common/MdfParser/IOScaleRange.h
trunk/MgDev/Common/Schema/ProfileResult-2.4.0.xsd
Log:
Fix issues with RFC110 submission
- year was incorrect in header block for new source files
- fix comment typos in schema
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -17,7 +17,7 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// The ProfileRenderLayersResult class implementation.
+// The ProfileRenderLabelsResult class implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
@@ -31,7 +31,6 @@
ProfileRenderLabelsResult::ProfileRenderLabelsResult()
{
this->m_dRenderTime = 0.0;
-
}
//-------------------------------------------------------------------------
@@ -43,7 +42,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The time of stylizing all labels in the map.
//-------------------------------------------------------------------------
const double ProfileRenderLabelsResult::GetRenderTime() const
@@ -62,6 +60,9 @@
this->m_dRenderTime = dRenderTime;
}
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileRenderLabelsResult::DumpMemoryLeaks()
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderLabelsResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -25,8 +25,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileRenderLabelsResult is the profiling result which records
- // information during labels rendering procsses.
+ // The ProfileRenderLabelsResult is the profiling result which records
+ // information during label rendering processes.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderLabelsResult : public MdfRootObject
{
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -44,7 +44,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ResourceId property.
-//
// RETURNS: The resource identifier of the layer.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderLayerResult::GetResourceId() const
@@ -65,7 +64,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the LayerName property.
-//
// RETURNS: The name of the layer.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderLayerResult::GetLayerName() const
@@ -86,7 +84,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the LayerType property.
-//
// RETURNS: The type (vector or raster) of the layer.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderLayerResult::GetLayerType() const
@@ -107,7 +104,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the FeatureClassName property.
-//
// RETURNS: The name of the feature class referenced by the layer.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderLayerResult::GetFeatureClassName() const
@@ -128,7 +124,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the CoordinateSystem property.
-//
// RETURNS: The coordinate system as WKT used by the layer.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderLayerResult::GetCoordinateSystem() const
@@ -149,7 +144,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ScaleRange property.
-//
// RETURNS: The current scale range of the layer in the map.
//-------------------------------------------------------------------------
const ScaleRange* ProfileRenderLayerResult::GetScaleRange() const
@@ -159,7 +153,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ScaleRange property.
-//
// RETURNS: The current scale range of the layer in the map.
//-------------------------------------------------------------------------
ScaleRange* ProfileRenderLayerResult::GetScaleRange()
@@ -196,7 +189,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the Filter property.
-//
// RETURNS: A boolean FDO expression that specifies which features to return.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderLayerResult::GetFilter() const
@@ -217,7 +209,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The time of stylizing the layer in the map.
//-------------------------------------------------------------------------
const double ProfileRenderLayerResult::GetRenderTime() const
@@ -236,7 +227,9 @@
this->m_dRenderTime = dRenderTime;
}
-
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileRenderLayerResult::DumpMemoryLeaks()
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderLayerResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -27,8 +27,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileRenderLayerResult is a Profiling result which records information
- // during a particular layer rendering procsses.
+ // The ProfileRenderLayerResult is a Profiling result which records
+ // information for a particular layer rendering process.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderLayerResult : public MdfRootObject
{
@@ -107,5 +107,6 @@
typedef MdfOwnerCollection<ProfileRenderLayerResult> ProfileRenderLayerResultCollection;
EXPIMP_TEMPLATE template class MDFMODEL_API MdfOwnerCollection<ProfileRenderLayerResult>;
+
END_NAMESPACE_MDFMODEL
-#endif // PROFILERENDERLAYERSRESULT_H_
+#endif // PROFILERENDERLAYERRESULT_H_
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -43,7 +43,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The time of stylizing all layers in the map.
//-------------------------------------------------------------------------
const double ProfileRenderLayersResult::GetRenderTime() const
@@ -64,7 +63,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ProfileRenderLayerResults property.
-//
// RETURNS: A collection of ProfileRenderLayerResult.
//-------------------------------------------------------------------------
ProfileRenderLayerResultCollection* ProfileRenderLayersResult::GetProfileRenderLayerResults()
@@ -72,6 +70,9 @@
return &this->m_profileRenderLayerResults;
}
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileRenderLayersResult::DumpMemoryLeaks()
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderLayersResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -27,8 +27,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileRenderLayersResult is a profiling result which records information
- // during layers rendering procsses.
+ // The ProfileRenderLayersResult is a profiling result which records
+ // information during layer rendering processes.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderLayersResult : public MdfRootObject
{
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -53,7 +53,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ResourceId property.
-//
// RETURNS: The resource identifier of the map.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderMapResult::GetResourceId() const
@@ -74,7 +73,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the CoordinateSystem property.
-//
// RETURNS: The coordinate system as WKT used by the map.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderMapResult::GetCoordinateSystem() const
@@ -115,7 +113,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the Scale property.
-//
// RETURNS: The initial display scale of the map.
//-------------------------------------------------------------------------
const double ProfileRenderMapResult::GetScale() const
@@ -136,7 +133,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the LayerCount property.
-//
// RETURNS: The number of layers in the map.
//-------------------------------------------------------------------------
const int ProfileRenderMapResult::GetLayerCount() const
@@ -157,7 +153,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ImageFormat property.
-//
// RETURNS: The format of the map image.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderMapResult::GetImageFormat() const
@@ -178,7 +173,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RendererType property.
-//
// RETURNS: The renderer used in the image rendering process.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderMapResult::GetRendererType() const
@@ -199,7 +193,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The total render time to generate the map image.
//-------------------------------------------------------------------------
const double ProfileRenderMapResult::GetRenderTime() const
@@ -401,9 +394,9 @@
this->m_profileRenderLabelsResult = NULL;
return pRet;
}
+
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the CreateImageTime property.
-//
// RETURNS: The time of rendering stylized map to an image.
//-------------------------------------------------------------------------
const double ProfileRenderMapResult::GetCreateImageTime() const
@@ -422,6 +415,9 @@
this->m_dCreateImageTime = dCreateImageTime;
}
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileRenderMapResult::DumpMemoryLeaks()
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderMapResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -33,7 +33,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
// The ProfileRenderMapResult class is one concrete implementation of ProfileResult.
- // It's a profiling result which records information during RenderMap or RenderDynamicOverlay procsses.
+ // It's a profiling result which records information during RenderMap or
+ // RenderDynamicOverlay processes.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderMapResult : public ProfileResult
{
@@ -85,28 +86,28 @@
void SetRenderTime(const double& dRenderTime);
// Property: ProfileRenderLayersResult
- // Profiling result which records information during layers rendering procsses.
+ // Profiling result which records information during layer rendering processes.
const ProfileRenderLayersResult* GetProfileRenderLayersResult() const;
ProfileRenderLayersResult* GetProfileRenderLayersResult();
void AdoptProfileRenderLayersResult(ProfileRenderLayersResult* pProfileRenderLayersResult);
ProfileRenderLayersResult* OrphanProfileRenderLayersResult();
// Property: ProfileRenderSelectionResult
- // Profiling result which records information during selection rendering procsses.
+ // Profiling result which records information during selection rendering processes.
const ProfileRenderSelectionResult* GetProfileRenderSelectionResult() const;
ProfileRenderSelectionResult* GetProfileRenderSelectionResult();
void AdoptProfileRenderSelectionResult(ProfileRenderSelectionResult* pProfileRenderSelectionResult);
ProfileRenderSelectionResult* OrphanProfileRenderSelectionResult();
// Property: ProfileRenderWatermarksResult
- // Profiling result which records information during watermarks rendering procsses.
+ // Profiling result which records information during watermark rendering processes.
const ProfileRenderWatermarksResult* GetProfileRenderWatermarksResult() const;
ProfileRenderWatermarksResult* GetProfileRenderWatermarksResult();
void AdoptProfileRenderWatermarksResult(ProfileRenderWatermarksResult* pProfileRenderWatermarksResult);
ProfileRenderWatermarksResult* OrphanProfileRenderWatermarksResult();
// Property: ProfileRenderLabelsResult
- // Profiling result which records information during labels rendering procsses.
+ // Profiling result which records information during label rendering processes.
const ProfileRenderLabelsResult* GetProfileRenderLabelsResult() const;
ProfileRenderLabelsResult* GetProfileRenderLabelsResult();
void AdoptProfileRenderLabelsResult(ProfileRenderLabelsResult* pProfileRenderLabelsResult);
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -17,7 +17,7 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// The ProfileRenderLayersResult class implementation.
+// The ProfileRenderSelectionResult class implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
@@ -41,7 +41,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The time of stylizing all selected layers in the map.
//-------------------------------------------------------------------------
const double ProfileRenderSelectionResult::GetRenderTime() const
@@ -62,7 +61,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the Filter property.
-//
// RETURNS: A boolean FDO expression that specifies which features to return.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderSelectionResult::GetFilter() const
@@ -83,10 +81,9 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ProfileRenderLayerResults property.
-//
// RETURNS: A collection of ProfileRenderLayerResult.
//-------------------------------------------------------------------------
ProfileRenderLayerResultCollection* ProfileRenderSelectionResult::GetProfileRenderSelectedLayerResults()
{
return &this->m_profileRenderSelectedLayerResults;
-}
\ No newline at end of file
+}
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderSelectionResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -27,8 +27,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileRenderSelectionResult is a profiling result which records information
- // during selected layers rendering procsses.
+ // The ProfileRenderSelectionResult is a profiling result which records
+ // information during selected layer rendering processes.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderSelectionResult : public MdfRootObject
{
@@ -49,7 +49,6 @@
const MdfString& GetFilter() const;
void SetFilter(const MdfString& pstrFilter);
-
// Property: ProfileRenderSelectedLayerResults
// A collection of ProfileRenderSelectedLayerResult.
ProfileRenderLayerResultCollection* GetProfileRenderSelectedLayerResults();
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -42,7 +42,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ResourceId property.
-//
// RETURNS: The resource identifier of the watermark.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderWatermarkResult::GetResourceId() const
@@ -63,7 +62,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the PositionType property.
-//
// RETURNS: The position type (XY or Tile) of the watermark.
//-------------------------------------------------------------------------
const MdfString& ProfileRenderWatermarkResult::GetPositionType() const
@@ -84,7 +82,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The time of stylizing a paricular watermark in the map.
//-------------------------------------------------------------------------
const double ProfileRenderWatermarkResult::GetRenderTime() const
@@ -103,7 +100,9 @@
this->m_dRenderTime = dRenderTime;
}
-
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileRenderWatermarkResult::DumpMemoryLeaks()
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderWatermarkResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -27,8 +27,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileRenderWatermarkResult is a Profiling result which records information
- // during a particular watermark rendering procsses.
+ // The ProfileRenderWatermarkResult is a Profiling result which records
+ // information during for watermark rendering process.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderWatermarkResult : public MdfRootObject
{
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -31,7 +31,6 @@
ProfileRenderWatermarksResult::ProfileRenderWatermarksResult()
{
this->m_dRenderTime = 0.0;
-
}
//-------------------------------------------------------------------------
@@ -43,7 +42,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the RenderTime property.
-//
// RETURNS: The time of stylizing all watermarks in the map.
//-------------------------------------------------------------------------
const double ProfileRenderWatermarksResult::GetRenderTime() const
@@ -64,7 +62,6 @@
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ProfileRenderWatermarkResults property.
-//
// RETURNS: A collection of ProfileRenderWatermarkResult.
//-------------------------------------------------------------------------
ProfileRenderWatermarkResultCollection* ProfileRenderWatermarksResult::GetProfileRenderWatermarkResults()
@@ -72,6 +69,9 @@
return &this->m_profileRenderWatermarkResults;
}
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileRenderWatermarksResult::DumpMemoryLeaks()
Modified: trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileRenderWatermarksResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -27,8 +27,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileRenderWatermarksResult is a profiling result which records information
- // during watermarks rendering procsses.
+ // The ProfileRenderWatermarksResult is a profiling result which records
+ // information during watermark rendering processes.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileRenderWatermarksResult : public MdfRootObject
{
@@ -44,13 +44,10 @@
const double GetRenderTime() const;
void SetRenderTime(const double& dRenderTime);
-
// Property: ProfileRenderWatermarkResults
// A collection of ProfileRenderWatermarkResult.
ProfileRenderWatermarkResultCollection* GetProfileRenderWatermarkResults();
-
-
//#ifdef _WIN32
#if _DEBUG
// for memory leak testing
Modified: trunk/MgDev/Common/MdfModel/ProfileResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -17,7 +17,7 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
-// The ScaleRange class implementation.
+// The ProfileResult class implementation.
//-------------------------------------------------------------------------
#include "stdafx.h"
@@ -47,7 +47,7 @@
{
return this->m_eProfileResultType;
}
-
+
//-------------------------------------------------------------------------
// PURPOSE: Accessor method for the ProfileResultType attribute.
// PARAMETERS:
@@ -59,6 +59,9 @@
this->m_eProfileResultType = type;
}
+//-------------------------------------------------------------------------
+// PURPOSE: For memory leak testing.
+//-------------------------------------------------------------------------
#ifdef _WIN32
#ifdef _DEBUG
int ProfileResult::DumpMemoryLeaks()
@@ -66,4 +69,4 @@
return _CrtDumpMemoryLeaks();
}
#endif
-#endif
\ No newline at end of file
+#endif
Modified: trunk/MgDev/Common/MdfModel/ProfileResult.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ProfileResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ProfileResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2010-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -25,8 +25,8 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // The ProfileResult class is the root document node of the MdfModel. Through its
- // interface, one can get access to all the data in the ProfileResult.
+ // The ProfileResult class is a root document node of the MdfModel. Through
+ // its interface, one can get access to all the data in the ProfileResult.
//------------------------------------------------------------------------
class MDFMODEL_API ProfileResult : public MdfRootObject
{
@@ -64,4 +64,4 @@
};
END_NAMESPACE_MDFMODEL
-#endif // PROFILERSULT_H_
+#endif // PROFILERESULT_H_
Modified: trunk/MgDev/Common/MdfModel/ScaleRange.cpp
===================================================================
--- trunk/MgDev/Common/MdfModel/ScaleRange.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ScaleRange.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -85,4 +85,4 @@
void ScaleRange::SetMaxScale(const double& dMaxScale)
{
this->m_dMaxScale = dMaxScale;
-}
\ No newline at end of file
+}
Modified: trunk/MgDev/Common/MdfModel/ScaleRange.h
===================================================================
--- trunk/MgDev/Common/MdfModel/ScaleRange.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfModel/ScaleRange.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -25,9 +25,9 @@
//-------------------------------------------------------------------------
// DESCRIPTION:
- // ScaleRange describes a range includes the min and max scales of a particular layer.
+ // ScaleRange describes the min and max scales for a layer's scale range.
//-------------------------------------------------------------------------
-class MDFMODEL_API ScaleRange : public MdfRootObject
+ class MDFMODEL_API ScaleRange : public MdfRootObject
{
public:
// Represents the maximum value for the map scale.
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -28,6 +28,7 @@
ELEM_MAP_ENTRY(2, RenderTime);
ELEM_MAP_ENTRY(3, ExtendedData1);
+
IOProfileRenderLabelsResult::IOProfileRenderLabelsResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderLabelsResult = NULL;
@@ -72,7 +73,7 @@
fd << tab.tab() << startStr(sRenderTime);
fd << DoubleToStr(profileRenderLabelsResult->GetRenderTime());
fd << endStr(sRenderTime) << std::endl;
-
+
// Write any unknown XML / extended data
IOUnknown::Write(fd, profileRenderLabelsResult->GetUnknownXml(), version, tab);
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderLabelsResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -36,6 +36,7 @@
ELEM_MAP_ENTRY(9, RenderTime);
ELEM_MAP_ENTRY(10, ExtendedData1);
+
IOProfileRenderLayerResult::IOProfileRenderLayerResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderLayerResult = NULL;
@@ -80,7 +81,7 @@
fd << tab.tab() << startStr(sResourceId);
fd << EncodeString(profileRenderLayerResult->GetResourceId());
fd << endStr(sResourceId) << std::endl;
-
+
// Property: LayerName
fd << tab.tab() << startStr(sLayerName);
fd << EncodeString(profileRenderLayerResult->GetLayerName());
@@ -103,7 +104,7 @@
// Property: ScaleRange
ScaleRange* scaleRange = profileRenderLayerResult->GetScaleRange();
- if(scaleRange)
+ if (scaleRange)
IOScaleRange::Write(fd, scaleRange, version, tab);
// Property: Filter
@@ -115,7 +116,7 @@
fd << tab.tab() << startStr(sRenderTime);
fd << DoubleToStr(profileRenderLayerResult->GetRenderTime());
fd << endStr(sRenderTime) << std::endl;
-
+
// Write any unknown XML / extended data
IOUnknown::Write(fd, profileRenderLayerResult->GetUnknownXml(), version, tab);
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderLayerResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -30,6 +30,7 @@
ELEM_MAP_ENTRY(3, ProfileRenderLayerResult);
ELEM_MAP_ENTRY(4, ExtendedData1);
+
IOProfileRenderLayersResult::IOProfileRenderLayersResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderLayersResult = NULL;
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderLayersResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -46,6 +46,7 @@
ELEM_MAP_ENTRY(15, CreateImageTime);
ELEM_MAP_ENTRY(16, ExtendedData1);
+
IOProfileRenderMapResult::IOProfileRenderMapResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderMapResult = NULL;
@@ -84,7 +85,7 @@
void IOProfileRenderMapResult::Write(MdfStream& fd, ProfileRenderMapResult* profileRenderMapResult, Version* version, MgTab& tab)
{
ProfileResult::ProfileResultType type = profileRenderMapResult->GetProfileResultType();
- if(ProfileResult::ProfileRenderMap)
+ if (ProfileResult::ProfileRenderMap)
fd << tab.tab() << startStr(sProfileRenderMapResult) << std::endl;
else //ProfileResult::ProfileRenderDynamicOverlay
fd << tab.tab() << startStr(sProfileRenderDynamicOverlayResult) << std::endl;
@@ -130,22 +131,22 @@
// Property: ProfileRenderLayersResult
ProfileRenderLayersResult* pProfileRenderLayersResult = profileRenderMapResult->GetProfileRenderLayersResult();
- if(pProfileRenderLayersResult)
+ if (pProfileRenderLayersResult)
IOProfileRenderLayersResult::Write(fd, pProfileRenderLayersResult, version, tab);
-
+
// Property: ProfileRenderSelectionResult
ProfileRenderSelectionResult* pProfileRenderSelectionResult = profileRenderMapResult->GetProfileRenderSelectionResult();
- if(pProfileRenderSelectionResult)
+ if (pProfileRenderSelectionResult)
IOProfileRenderSelectionResult::Write(fd, pProfileRenderSelectionResult, version, tab);
// Property: ProfileRenderWatermarksResult
ProfileRenderWatermarksResult* pProfileRenderWatermarksResult = profileRenderMapResult->GetProfileRenderWatermarksResult();
- if(pProfileRenderWatermarksResult)
+ if (pProfileRenderWatermarksResult)
IOProfileRenderWatermarksResult::Write(fd, pProfileRenderWatermarksResult, version, tab);
// Property: ProfileRenderLabelsResult
ProfileRenderLabelsResult* pProfileRenderLabelsResult = profileRenderMapResult->GetProfileRenderLabelsResult();
- if(pProfileRenderLabelsResult)
+ if (pProfileRenderLabelsResult)
IOProfileRenderLabelsResult::Write(fd, pProfileRenderLabelsResult, version, tab);
// Property: CreateImageTime
@@ -157,7 +158,7 @@
IOUnknown::Write(fd, profileRenderMapResult->GetUnknownXml(), version, tab);
tab.dectab();
- if(ProfileResult::ProfileRenderMap)
+ if (ProfileResult::ProfileRenderMap)
fd << tab.tab() << endStr(sProfileRenderMapResult) << std::endl;
else //ProfileResult::ProfileRenderDynamicOverlay
fd << tab.tab() << endStr(sProfileRenderDynamicOverlayResult) << std::endl;
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderMapResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -31,6 +31,7 @@
ELEM_MAP_ENTRY(4, ProfileRenderLayerResult);
ELEM_MAP_ENTRY(5, ExtendedData1);
+
IOProfileRenderSelectionResult::IOProfileRenderSelectionResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderSelectionResult = NULL;
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderSelectionResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -30,6 +30,7 @@
ELEM_MAP_ENTRY(4, RenderTime);
ELEM_MAP_ENTRY(5, ExtendedData1);
+
IOProfileRenderWatermarkResult::IOProfileRenderWatermarkResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderWatermarkResult = NULL;
@@ -74,7 +75,7 @@
fd << tab.tab() << startStr(sResourceId);
fd << EncodeString(profileRenderWatermarkResult->GetResourceId());
fd << endStr(sResourceId) << std::endl;
-
+
// Property: PositionType
fd << tab.tab() << startStr(sPositionType);
fd << EncodeString(profileRenderWatermarkResult->GetPositionType());
@@ -84,7 +85,7 @@
fd << tab.tab() << startStr(sRenderTime);
fd << DoubleToStr(profileRenderWatermarkResult->GetRenderTime());
fd << endStr(sRenderTime) << std::endl;
-
+
// Write any unknown XML / extended data
IOUnknown::Write(fd, profileRenderWatermarkResult->GetUnknownXml(), version, tab);
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarkResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -30,6 +30,7 @@
ELEM_MAP_ENTRY(3, ProfileRenderWatermarkResult);
ELEM_MAP_ENTRY(4, ExtendedData1);
+
IOProfileRenderWatermarksResult::IOProfileRenderWatermarksResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileRenderWatermarksResult = NULL;
Modified: trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileRenderWatermarksResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOProfileResult.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileResult.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileResult.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -28,6 +28,7 @@
ELEM_MAP_ENTRY(1, ProfileResult);
ELEM_MAP_ENTRY(2, ExtendedData1);
+
IOProfileResult::IOProfileResult(Version& version) : SAX2ElementHandler(version)
{
this->m_profileResult = NULL;
@@ -106,10 +107,8 @@
}
// need default?
-
}
-
-
+
// Write any unknown XML / extended data
IOUnknown::Write(fd, profileResult->GetUnknownXml(), version, tab);
Modified: trunk/MgDev/Common/MdfParser/IOProfileResult.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOProfileResult.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOProfileResult.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/MdfParser/IOScaleRange.cpp
===================================================================
--- trunk/MgDev/Common/MdfParser/IOScaleRange.cpp 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOScaleRange.cpp 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
@@ -29,6 +29,7 @@
ELEM_MAP_ENTRY(3, MaxScale);
ELEM_MAP_ENTRY(4, ExtendedData1);
+
IOScaleRange::IOScaleRange(Version& version) : SAX2ElementHandler(version)
{
this->m_scaleRange = NULL;
@@ -73,13 +74,12 @@
fd << tab.tab() << startStr(sMinScale);
fd << DoubleToStr(scaleRange->GetMinScale());
fd << endStr(sMinScale) << std::endl;
-
// Property: MaxScale
fd << tab.tab() << startStr(sMaxScale);
fd << DoubleToStr(scaleRange->GetMaxScale());
fd << endStr(sMaxScale) << std::endl;
-
+
// Write any unknown XML / extended data
IOUnknown::Write(fd, scaleRange->GetUnknownXml(), version, tab);
Modified: trunk/MgDev/Common/MdfParser/IOScaleRange.h
===================================================================
--- trunk/MgDev/Common/MdfParser/IOScaleRange.h 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/MdfParser/IOScaleRange.h 2011-08-22 15:11:15 UTC (rev 6086)
@@ -1,5 +1,5 @@
//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
+// Copyright (C) 2011 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
Modified: trunk/MgDev/Common/Schema/ProfileResult-2.4.0.xsd
===================================================================
--- trunk/MgDev/Common/Schema/ProfileResult-2.4.0.xsd 2011-08-22 06:05:08 UTC (rev 6085)
+++ trunk/MgDev/Common/Schema/ProfileResult-2.4.0.xsd 2011-08-22 15:11:15 UTC (rev 6086)
@@ -30,7 +30,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderMapType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during RenderMap or RenderDynamicOverlay procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during RenderMap or RenderDynamicOverlay processes.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="ResourceId" type="xs:string">
@@ -75,22 +75,22 @@
</xs:element>
<xs:element name="ProfileRenderLayers" type="ProfileRenderLayersType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during layers rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during layer rendering processes.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ProfileRenderSelection" type="ProfileRenderSelectionType" minOccurs="0" maxOccurs="1">
<xs:annotation>
- <xs:documentation>Profiling result which records information during selection rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during selection rendering processes.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ProfileRenderWatermarks" type="ProfileRenderWatermarksType" minOccurs="0" maxOccurs="1">
<xs:annotation>
- <xs:documentation>Profiling result which records information during watermarks rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during watermark rendering processes.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ProfileRenderLabels" type="ProfileRenderLabelsType" minOccurs="0" maxOccurs="1">
<xs:annotation>
- <xs:documentation>Profiling result which records information during labels rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during label rendering processes.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="CreateImageTime" type="xs:double">
@@ -103,7 +103,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderLayersType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during layers rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during layer rendering processes.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="RenderTime" type="xs:double">
@@ -113,7 +113,7 @@
</xs:element>
<xs:element name="ProfileRenderLayer" type="ProfileRenderLayerType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>Profiling result which records information during a particular layer rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information for a particular layer rendering process.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
@@ -121,7 +121,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderSelectionType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during selected layers rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during selected layer rendering processes.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="RenderTime" type="xs:double">
@@ -136,7 +136,7 @@
</xs:element>
<xs:element name="ProfileSelectedRenderLayer" type="ProfileRenderLayerType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>Profiling result which records information during a particular selected layer rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information for a particular selected layer rendering process.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
@@ -144,7 +144,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderWatermarksType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during watermarks rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during watermark rendering processes.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="RenderTime" type="xs:double">
@@ -154,7 +154,7 @@
</xs:element>
<xs:element name="ProfileRenderWatermark" type="ProfileRenderWatermarkType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
- <xs:documentation>Profiling result which records information during a particular watermark rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information for a particular watermark rendering process.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="ExtendedData1" type="ExtendedDataType" minOccurs="0"/>
@@ -162,7 +162,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderLabelsType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during labels rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information during label rendering processes.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="RenderTime" type="xs:double">
@@ -175,7 +175,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderLayerType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during a particular layer rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information for a particular layer rendering process.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="ResourceId" type="xs:string">
@@ -223,7 +223,7 @@
</xs:complexType>
<xs:complexType name="ProfileRenderWatermarkType">
<xs:annotation>
- <xs:documentation>Profiling result which records information during a particular watermark rendering procsses.</xs:documentation>
+ <xs:documentation>Profiling result which records information for a particular watermark rendering process.</xs:documentation>
</xs:annotation>
<xs:sequence>
<xs:element name="ResourceId" type="xs:string">
More information about the mapguide-commits
mailing list