[mapguide-commits] r6665 - trunk/MgDev/Server/src/Services/Rendering
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri May 18 06:28:25 EDT 2012
Author: jng
Date: 2012-05-18 03:28:25 -0700 (Fri, 18 May 2012)
New Revision: 6665
Modified:
trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp
Log:
#1105: Add extents to logged map rendering calls. Note that profiled versions of these calls do not log extents.
Modified: trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2012-05-18 10:25:19 UTC (rev 6664)
+++ trunk/MgDev/Server/src/Services/Rendering/OpRenderDynamicOverlay.cpp 2012-05-18 10:28:25 UTC (rev 6665)
@@ -71,6 +71,9 @@
selection->SetMap(map);
Ptr<MgRenderingOptions> options = (MgRenderingOptions*)m_stream->GetObject();
+ Ptr<MgEnvelope> env = map->GetDataExtent();
+ Ptr<MgCoordinate> ll = env->GetLowerLeftCoordinate();
+ Ptr<MgCoordinate> ur = env->GetUpperRightCoordinate();
BeginExecution();
@@ -85,6 +88,20 @@
MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgColor");
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ // [(llx lly) (urx ury)]
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" [");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START()
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"] ");
Validate();
Modified: trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp 2012-05-18 10:25:19 UTC (rev 6664)
+++ trunk/MgDev/Server/src/Services/Rendering/OpRenderMap.cpp 2012-05-18 10:28:25 UTC (rev 6665)
@@ -76,6 +76,10 @@
bool bKeepSelection = false;
m_stream->GetBoolean(bKeepSelection);
+ Ptr<MgEnvelope> env = map->GetDataExtent();
+ Ptr<MgCoordinate> ll = env->GetLowerLeftCoordinate();
+ Ptr<MgCoordinate> ur = env->GetUpperRightCoordinate();
+
BeginExecution();
MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
@@ -87,7 +91,20 @@
MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bKeepSelection);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
-
+ // [(llx lly) (urx ury)]
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" [");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START()
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"] ");
Validate();
Ptr<MgByteReader> byteReader =
@@ -105,6 +122,10 @@
if(selection)
selection->SetMap(map);
+ Ptr<MgEnvelope> env = map->GetDataExtent();
+ Ptr<MgCoordinate> ll = env->GetLowerLeftCoordinate();
+ Ptr<MgCoordinate> ur = env->GetUpperRightCoordinate();
+
STRING format;
m_stream->GetString(format);
@@ -126,6 +147,20 @@
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bKeepSelection);
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bClip);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ // [(llx lly) (urx ury)]
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" [");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START()
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"] ");
Validate();
@@ -145,6 +180,8 @@
selection->SetMap(map);
Ptr<MgEnvelope> extents = (MgEnvelope*)m_stream->GetObject();
+ Ptr<MgCoordinate> ll = extents->GetLowerLeftCoordinate();
+ Ptr<MgCoordinate> ur = extents->GetUpperRightCoordinate();
INT32 width = 0;
m_stream->GetInt32(width);
@@ -179,6 +216,20 @@
MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bKeepSelection);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ // [(llx lly) (urx ury)]
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" [");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START()
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"] ");
Validate();
@@ -197,6 +248,9 @@
if(selection)
selection->SetMap(map);
+ Ptr<MgEnvelope> env = map->GetDataExtent();
+ Ptr<MgCoordinate> ll = env->GetLowerLeftCoordinate();
+ Ptr<MgCoordinate> ur = env->GetUpperRightCoordinate();
Ptr<MgCoordinate> center = (MgCoordinate*)m_stream->GetObject();
double scale = 0.0;
@@ -237,6 +291,20 @@
MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bKeepSelection);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ // [(llx lly) (urx ury)]
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" [");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START()
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ll->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_START();
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetX());
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L" ");
+ MG_LOG_OPERATION_MESSAGE_ADD_DOUBLE(ur->GetY());
+ MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
+ MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"] ");
Validate();
More information about the mapguide-commits
mailing list