[mapguide-commits] r6732 - in branches/2.4/MgDev/Desktop: DotNetHarness/Rendering DotNetHarness/Tile MapViewer.Desktop MapViewerTest MgDesktop/Services MgDesktop/Services/Rendering SampleExtension UnitTest
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jun 5 04:55:21 PDT 2012
Author: jng
Date: 2012-06-05 04:55:19 -0700 (Tue, 05 Jun 2012)
New Revision: 6732
Modified:
branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderDynamicOverlayControl.cs
branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderMapControl.cs
branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderTileControl.cs
branches/2.4/MgDev/Desktop/DotNetHarness/Tile/GetTileControl.cs
branches/2.4/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs
branches/2.4/MgDev/Desktop/MapViewerTest/MgAppWindow.cs
branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h
branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.cpp
branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h
branches/2.4/MgDev/Desktop/SampleExtension/MgProfileComponent.cs
branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp
branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.h
branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.cpp
branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.h
branches/2.4/MgDev/Desktop/UnitTest/TestTileService.cpp
branches/2.4/MgDev/Desktop/UnitTest/TestTileService.h
Log:
mg-desktop: Use the "Mgd" prefix for all of our service class implementation (another thing we should've done from the beginning)
Modified: branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderDynamicOverlayControl.cs
===================================================================
--- branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderDynamicOverlayControl.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderDynamicOverlayControl.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -23,7 +23,7 @@
try
{
var fact = new MgServiceFactory();
- MgRenderingService renSvc = (MgRenderingService)fact.CreateService(MgServiceType.RenderingService);
+ MgdRenderingService renSvc = (MgdRenderingService)fact.CreateService(MgServiceType.RenderingService);
MgResourceIdentifier resId = new MgResourceIdentifier(textBox1.Text);
var sw = new Stopwatch();
Modified: branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderMapControl.cs
===================================================================
--- branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderMapControl.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderMapControl.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -26,7 +26,7 @@
try
{
var fact = new MgServiceFactory();
- MgRenderingService renSvc = (MgRenderingService)fact.CreateService(MgServiceType.RenderingService);
+ MgdRenderingService renSvc = (MgdRenderingService)fact.CreateService(MgServiceType.RenderingService);
MgResourceIdentifier resId = new MgResourceIdentifier(textBox1.Text);
MgdMap map = new MgdMap(resId);
Modified: branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderTileControl.cs
===================================================================
--- branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderTileControl.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/DotNetHarness/Rendering/RenderTileControl.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -23,7 +23,7 @@
try
{
var fact = new MgServiceFactory();
- MgRenderingService renSvc = (MgRenderingService)fact.CreateService(MgServiceType.RenderingService);
+ MgdRenderingService renSvc = (MgdRenderingService)fact.CreateService(MgServiceType.RenderingService);
MgResourceIdentifier mdfId = new MgResourceIdentifier(txtMapDefinition.Text);
var sw = new Stopwatch();
Modified: branches/2.4/MgDev/Desktop/DotNetHarness/Tile/GetTileControl.cs
===================================================================
--- branches/2.4/MgDev/Desktop/DotNetHarness/Tile/GetTileControl.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/DotNetHarness/Tile/GetTileControl.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -23,7 +23,7 @@
try
{
var fact = new MgServiceFactory();
- MgTileService renSvc = (MgTileService)fact.CreateService(MgServiceType.TileService);
+ MgdTileService renSvc = (MgdTileService)fact.CreateService(MgServiceType.TileService);
MgResourceIdentifier mdfId = new MgResourceIdentifier(txtMapDefinition.Text);
if (rdRuntimeMap.Checked)
Modified: branches/2.4/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MapViewer.Desktop/MgDesktopMapViewerProvider.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -9,7 +9,7 @@
public class MgDesktopMapViewerProvider : MgMapViewerProvider
{
private MgdMap _implMap;
- private MgRenderingService _renderSvc;
+ private MgdRenderingService _renderSvc;
private MgdMappingService _mappingSvc;
private MgServiceFactory _fact;
@@ -26,7 +26,8 @@
protected override void SubInit()
{
_fact = new MgServiceFactory();
- _renderSvc = (MgRenderingService)_fact.CreateService(MgServiceType.RenderingService);
+ _renderSvc = (MgdRenderingService)_fact.CreateService(MgServiceType.RenderingService);
+ _mappingSvc = (MgdMappingService)_fact.CreateService(MgServiceType.MappingService);
}
private MgRenderingOptions _lastRenderOpts;
Modified: branches/2.4/MgDev/Desktop/MapViewerTest/MgAppWindow.cs
===================================================================
--- branches/2.4/MgDev/Desktop/MapViewerTest/MgAppWindow.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MapViewerTest/MgAppWindow.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -125,7 +125,7 @@
{
var provider = mapViewer.GetProvider();
var map = mapViewer.GetMap();
- var prof = (MgProfilingService)provider.CreateService(MgServiceType.ProfilingService);
+ var prof = (MgdProfilingService)provider.CreateService(MgServiceType.ProfilingService);
var opts = new MgRenderingOptions("PNG", 2, new MgColor(mapViewer.SelectionColor));
var result = prof.ProfileRenderDynamicOverlay((MgdMap)map, (MgdSelection)mapViewer.GetSelection(), opts);
new XmlResponseDialog(result).ShowDialog();
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -23,7 +23,7 @@
/// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing in the resource repository.
/// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::GetDrawing(MgResourceIdentifier* resource)
+MgByteReader* MgdDrawingService::GetDrawing(MgResourceIdentifier* resource)
{
Ptr<MgByteReader> byteReader;
@@ -36,11 +36,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == resource) ? L"MgResourceIdentifier" : resource->ToString().c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::GetDrawing()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::GetDrawing()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.GetDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.GetDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Get the name of the dwf file from the resource content and remove the path from the filename
@@ -56,7 +56,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::GetDrawing")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::GetDrawing")
if (mgException != NULL)
{
@@ -92,7 +92,7 @@
/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
/// - MgDwfException if the DWF component encounters errors.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::DescribeDrawing(MgResourceIdentifier* resource)
+MgByteReader* MgdDrawingService::DescribeDrawing(MgResourceIdentifier* resource)
{
Ptr<MgByteReader> byteReader;
@@ -105,11 +105,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == resource) ? L"MgResourceIdentifier" : resource->ToString().c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::DescribeDrawing()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::DescribeDrawing()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.DescribeDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.DescribeDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
}
else
{
@@ -139,7 +139,7 @@
DWFCORE_FREE_OBJECT(pStream);
if (0 != pBuffer)
DWFCORE_FREE_MEMORY(pBuffer);
- throw new MgInvalidCastException(L"MgDrawingService.DescribeDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgInvalidCastException(L"MgdDrawingService.DescribeDrawing", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Return the manifest via a MgByteReader
@@ -158,7 +158,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::DescribeDrawing")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::DescribeDrawing")
if (mgException != NULL)
{
@@ -179,13 +179,13 @@
//////////////////////////////////////////////////////////////////
/// <summary>
/// GetSection() returns a DWF containing only the requested section. The section is specified by resource identifier (to get the DWF from the repository),
-/// and the section name. The section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+/// and the section name. The section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </summary>
/// <param name="resource">Input
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
-/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <returns>
/// Returns DWF stream containing the specified section.
@@ -202,7 +202,7 @@
/// - MgDwfException if the DWF component encounters errors.
/// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::GetSection(MgResourceIdentifier* resource, CREFSTRING sectionName)
+MgByteReader* MgdDrawingService::GetSection(MgResourceIdentifier* resource, CREFSTRING sectionName)
{
Ptr<MgByteReader> byteReader;
@@ -217,11 +217,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(sectionName.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::GetSection()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::GetSection()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.GetSection", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, NULL, L"", NULL);
}
else if (sectionName.empty())
{
@@ -229,7 +229,7 @@
arguments.Add(L"2");
arguments.Add(MgResources::BlankArgument);
- throw new MgInvalidArgumentException(L"MgDrawingService.GetSection",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.GetSection",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
else
@@ -243,7 +243,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgDwfSectionNotFoundException(L"MgDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgDwfSectionNotFoundException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// Create a DWFPackageWriter for writing the section to a temporary DWF file
@@ -277,7 +277,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::GetSection")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::GetSection")
if (mgException != NULL)
{
@@ -300,8 +300,8 @@
/// GetSectionResource() extracts a specific resource from the DWF package.
/// It is specified by the resource identifier (to get the DWF from the repository)
/// and the resource name (to get the DWF resource from the DWF package).
-/// A list of resource names can be retrieved via call to MgDrawingServices::EnumerateSectionResources(),
-/// or from the manifest.xml via call to MgDrawingServices::DescribeDrawing().
+/// A list of resource names can be retrieved via call to MgdDrawingServices::EnumerateSectionResources(),
+/// or from the manifest.xml via call to MgdDrawingServices::DescribeDrawing().
/// Refer to the DWF Format Specification at http://viewers/web/Olema/pdf/DWF%206%20Corporate%20Publishing%20Format.pdf for more information resource files associated with a particular section.
///
/// </summary>
@@ -310,8 +310,8 @@
/// </param>
/// <param name="resourceName">Input
/// Unique resource name of an item in the DWF.
-/// The item's name can be retrieved from call to MgDrawingServices::EnumerateDrawingServices(),
-/// or from the manifest.xml via call to MgDrawingServices::DescribeDrawing().
+/// The item's name can be retrieved from call to MgdDrawingServices::EnumerateDrawingServices(),
+/// or from the manifest.xml via call to MgdDrawingServices::DescribeDrawing().
/// </param>
/// <returns>
/// Returns byte stream for the item.
@@ -330,7 +330,7 @@
/// - MgDwfException if the DWF component encounters errors.
/// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::GetSectionResource(MgResourceIdentifier* resource, CREFSTRING resourceName)
+MgByteReader* MgdDrawingService::GetSectionResource(MgResourceIdentifier* resource, CREFSTRING resourceName)
{
Ptr<MgByteReader> byteReader;
@@ -345,11 +345,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(resourceName.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::GetSectionResource()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::GetSectionResource()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.GetSectionResource", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, NULL, L"", NULL);
}
else if (resourceName.empty())
{
@@ -357,7 +357,7 @@
arguments.Add(L"2");
arguments.Add(MgResources::BlankArgument);
- throw new MgInvalidArgumentException(L"MgDrawingService.GetSectionResource",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.GetSectionResource",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
else
@@ -373,7 +373,7 @@
arguments.Add(L"2");
arguments.Add(resourceName);
- throw new MgInvalidArgumentException(L"MgDrawingService.GetSectionResource",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.GetSectionResource",
__LINE__, __WFILE__, &arguments, L"MgResourceNameSeparatorNotFound", NULL);
}
sectionName = resourceName.substr(0, index);
@@ -384,7 +384,7 @@
arguments.Add(L"2");
arguments.Add(resourceName);
- throw new MgInvalidArgumentException(L"MgDrawingService.GetSectionResource",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.GetSectionResource",
__LINE__, __WFILE__, &arguments, L"MgResourceNameDoesNotContainSectionName", NULL);
}
@@ -395,7 +395,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgDwfSectionNotFoundException(L"MgDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgDwfSectionNotFoundException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// ...check if the resource exists in the section
DWFResource* pResource = pSection->findResourceByHREF(resourceName.c_str());
@@ -403,7 +403,7 @@
{
MgStringCollection arguments;
arguments.Add(resourceName);
- throw new MgDwfSectionResourceNotFoundException(L"MgDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgDwfSectionResourceNotFoundException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// ...get the mime type for the resource
STRING wsMimeType = (STRING)pResource->mime();
@@ -420,7 +420,7 @@
DWFCORE_FREE_OBJECT(pStream);
if (0 != pBuffer)
DWFCORE_FREE_MEMORY(pBuffer);
- throw new MgInvalidCastException(L"MgDrawingService.GetSectionResource", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgInvalidCastException(L"MgdDrawingService.GetSectionResource", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Return the resource via a MgByteReader
@@ -439,7 +439,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::GetSectionResource")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::GetSectionResource")
if (mgException != NULL)
{
@@ -461,15 +461,15 @@
/// <summary>
/// EnumerateLayers() returns the layer names in a DWF ePlot section. An ePlot section is also known as a "sheet" in DWF viewers.
/// The ePlot section is specified by resource identifier (to get the DWF from the repository), and section name.
-/// A list of all sections in a DWF can be retrieved from call to MgDrawingServices::EnumerateSections(),
-/// or from the manifest.xml via call to MgDrawingServices::DescribeDrawing().
+/// A list of all sections in a DWF can be retrieved from call to MgdDrawingServices::EnumerateSections(),
+/// or from the manifest.xml via call to MgdDrawingServices::DescribeDrawing().
// Refer to the DWF Format Specification at http://viewers/web/Olema/pdf/DWF%206%20Corporate%20Publishing%20Format.pdf for more information on the manifest and sections.
/// </summary>
/// <param name="resource">Input
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
-/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <returns>
/// Returns the pointer to a StringCollection of layer names.
@@ -485,7 +485,7 @@
/// - MgDwfException if the DWF component encounters errors.
/// - MgTemporaryFileNotAvailableException if a temporary file need to complete the operation cannot be generated or accessed.
/// - See MgResourceService for additional exceptions.
-MgStringCollection* MgDrawingService::EnumerateLayers(MgResourceIdentifier* resource, CREFSTRING sectionName)
+MgStringCollection* MgdDrawingService::EnumerateLayers(MgResourceIdentifier* resource, CREFSTRING sectionName)
{
Ptr<MgStringCollection> layers;
@@ -500,11 +500,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(sectionName.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::EnumerateLayers()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::EnumerateLayers()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
}
else if (sectionName.empty())
{
@@ -512,7 +512,7 @@
arguments.Add(L"2");
arguments.Add(MgResources::BlankArgument);
- throw new MgInvalidArgumentException(L"MgDrawingService.EnumerateLayers",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.EnumerateLayers",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
else
@@ -526,7 +526,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgDwfSectionNotFoundException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgDwfSectionNotFoundException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// Get the resources for the section
@@ -546,7 +546,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgInvalidDwfSectionException(L"MgDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgInvalidDwfSectionException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
}
pResource = piResources->get();
@@ -558,13 +558,13 @@
if (0 == pResource)
{
- throw new MgNullReferenceException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
}
DWFInputStream* pStream = pResource->getInputStream();
if (0 == pStream)
{
- throw new MgNullReferenceException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
}
size_t nBytes = pStream->available();
char* pBuffer = DWFCORE_ALLOC_MEMORY( char, nBytes );
@@ -572,7 +572,7 @@
DWFCORE_FREE_OBJECT(pStream);
if (0 == pBuffer)
{
- throw new MgNullReferenceException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Write the memory buffer to a temporary file
@@ -582,7 +582,7 @@
FILE* fp = fopen( tempW2dFileName.c_str(), "wb+" ); // NOXLATE
if (0 == fp)
{
- throw new MgTemporaryFileNotAvailableException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgTemporaryFileNotAvailableException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
}
fwrite(pBuffer, sizeof(char), nBytes, fp);
@@ -626,7 +626,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::EnumerateLayers")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::EnumerateLayers")
if (mgException != NULL)
{
@@ -652,10 +652,10 @@
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
-/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <param name="layerName">Input
-/// layerName specifies the name of the layer to retrieve from a particular section. A list of layer names can can be retrieved via call to MgDrawingService::EnumerateLayers().
+/// layerName specifies the name of the layer to retrieve from a particular section. A list of layer names can can be retrieved via call to MgdDrawingService::EnumerateLayers().
/// </param>
/// <returns>
/// Returns DWF stream containing the specified layer (in a section)
@@ -672,7 +672,7 @@
/// - MgLayerNotFoundException if the requested layer does not exist in the requested section of the DWF package.
/// - MgDwfException if the DWF component encounters errors.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::GetLayer( MgResourceIdentifier* resource, CREFSTRING sectionName, CREFSTRING layerName )
+MgByteReader* MgdDrawingService::GetLayer( MgResourceIdentifier* resource, CREFSTRING sectionName, CREFSTRING layerName )
{
Ptr<MgByteReader> byteReader;
Ptr<MgStringCollection> layers;
@@ -690,11 +690,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(layerName.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::GetLayer()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::GetLayer()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
else if (sectionName.empty())
{
@@ -702,7 +702,7 @@
arguments.Add(L"2");
arguments.Add(MgResources::BlankArgument);
- throw new MgInvalidArgumentException(L"MgDrawingService.GetLayer",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.GetLayer",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
else
@@ -716,7 +716,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgDwfSectionNotFoundException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgDwfSectionNotFoundException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, &arguments, L"", NULL);
}
pSection->readDescriptor();
@@ -737,7 +737,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgInvalidDwfSectionException(L"MgDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgInvalidDwfSectionException(L"MgdDrawingService.GetSection", __LINE__, __WFILE__, &arguments, L"", NULL);
}
pResource = piResources->get();
@@ -749,13 +749,13 @@
if (0 == pResource)
{
- throw new MgNullReferenceException(L"MgDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"MgdDrawingService.EnumerateLayers", __LINE__, __WFILE__, NULL, L"", NULL);
}
DWFInputStream* pStream = pResource->getInputStream();
if (0 == pStream)
{
- throw new MgNullReferenceException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
size_t nBytes = pStream->available();
char* pBuffer = DWFCORE_ALLOC_MEMORY( char, nBytes );
@@ -763,7 +763,7 @@
DWFCORE_FREE_OBJECT(pStream);
if (0 == pBuffer)
{
- throw new MgNullReferenceException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullReferenceException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Write the memory buffer to a temporary file
@@ -773,7 +773,7 @@
FILE* fp = fopen( tempW2dFileName.c_str(), "wb+" ); // NOXLATE
if (0 == fp)
{
- throw new MgTemporaryFileNotAvailableException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgTemporaryFileNotAvailableException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
fwrite(pBuffer, sizeof(char), nBytes, fp);
@@ -845,7 +845,7 @@
// Cannot find specified layer in the Dwf section
MgStringCollection arguments;
arguments.Add(targetLayer.name);
- throw new MgLayerNotFoundException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgLayerNotFoundException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// Use EPlotSection to get section color, paper
@@ -868,7 +868,7 @@
pPaper) );
if (0 == pPage)
{
- throw new MgOutOfMemoryException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgOutOfMemoryException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Set properties for the section
pPage->provideProperty(
@@ -885,7 +885,7 @@
L"") );
if (0 == p2Dgfx)
{
- throw new MgOutOfMemoryException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgOutOfMemoryException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
p2Dgfx->configureGraphic(pTransform, pExtents, pClip);
@@ -895,14 +895,14 @@
if (pW2DFile == NULL)
{
DWFCORE_FREE_OBJECT( p2Dgfx );
- throw new MgOutOfMemoryException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgOutOfMemoryException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
DWFFileInputStream* pW2DFilestream = DWFCORE_ALLOC_OBJECT( DWFFileInputStream );
if (pW2DFilestream == NULL)
{
DWFCORE_FREE_OBJECT( p2Dgfx );
DWFCORE_FREE_OBJECT( pW2DFile );
- throw new MgOutOfMemoryException(L"MgDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgOutOfMemoryException(L"MgdDrawingService.GetLayer", __LINE__, __WFILE__, NULL, L"", NULL);
}
//... open the file and bind it to the stream
pW2DFile->open();
@@ -953,7 +953,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::GetLayer")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::GetLayer")
if (mgException != NULL)
{
@@ -990,7 +990,7 @@
/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
/// - MgDwfException if the DWF component encounters errors.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::EnumerateSections(MgResourceIdentifier* resource)
+MgByteReader* MgdDrawingService::EnumerateSections(MgResourceIdentifier* resource)
{
Ptr<MgByteReader> byteReader;
@@ -1004,11 +1004,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_SEPARATOR();
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::EnumerateSections()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::EnumerateSections()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.EnumerateSections", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.EnumerateSections", __LINE__, __WFILE__, NULL, L"", NULL);
}
else
{
@@ -1091,7 +1091,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::EnumerateSections")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::EnumerateSections")
if (mgException != NULL)
{
@@ -1113,13 +1113,13 @@
/// <summary>
/// EnumerateSectionResources() enumerates the resources of a DWF section. The DWF is identified by it's
/// resource identifier and the section is identified by name. The section name
-/// will be retrieved from manifest.xml or from MgDrawingServices::EnumerateSections() API.
+/// will be retrieved from manifest.xml or from MgdDrawingServices::EnumerateSections() API.
/// </summary>
/// <param name="resource">Input
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
-/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+/// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <returns>
/// Returns MgByteReader object representing resources in a DWF section.
@@ -1135,7 +1135,7 @@
/// - MgInvalidDwfPackageException if the DWF specified by the resource identifier is not a DWF of version 6.0 or greater.
/// - MgDwfException if the DWF component encounters errors.
/// - See MgResourceService for additional exceptions.
-MgByteReader* MgDrawingService::EnumerateSectionResources(MgResourceIdentifier* resource, CREFSTRING sectionName)
+MgByteReader* MgdDrawingService::EnumerateSectionResources(MgResourceIdentifier* resource, CREFSTRING sectionName)
{
Ptr<MgByteReader> byteReader;
@@ -1150,11 +1150,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(sectionName.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::EnumerateSectionResources()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::EnumerateSectionResources()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, NULL, L"", NULL);
}
else if (sectionName.empty())
{
@@ -1162,7 +1162,7 @@
arguments.Add(L"2");
arguments.Add(MgResources::BlankArgument);
- throw new MgInvalidArgumentException(L"MgDrawingService.EnumerateSectionResources",
+ throw new MgInvalidArgumentException(L"MgdDrawingService.EnumerateSectionResources",
__LINE__, __WFILE__, &arguments, L"MgStringEmpty", NULL);
}
else
@@ -1176,7 +1176,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgDwfSectionNotFoundException(L"MgDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgDwfSectionNotFoundException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// Get all the resources in the section
@@ -1186,7 +1186,7 @@
{
MgStringCollection arguments;
arguments.Add(sectionName);
- throw new MgInvalidDwfSectionException(L"MgDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
+ throw new MgInvalidDwfSectionException(L"MgdDrawingService.EnumerateSectionResources", __LINE__, __WFILE__, &arguments, L"", NULL);
}
// Iterate through the resources and write to xml document
@@ -1252,7 +1252,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::EnumerateSections")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::EnumerateSections")
if (mgException != NULL)
{
@@ -1286,7 +1286,7 @@
/// - MgServiceNotAvailableException if the underlying resource service cannot be obtained to access the drawing resource in the repository.
/// - MgXmlParserException if there are problems parsing the resource content specified by the resource identifier.
/// - See MgResourceService for additional exceptions.
-STRING MgDrawingService::GetCoordinateSpace(MgResourceIdentifier* resource)
+STRING MgdDrawingService::GetCoordinateSpace(MgResourceIdentifier* resource)
{
STRING dwfCoordinateSpace = L"";
@@ -1299,11 +1299,11 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING((NULL == resource) ? L"MgResourceIdentifier" : resource->ToString().c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgDrawingService::GetCoordinateSpace()");
+ MG_LOG_TRACE_ENTRY(L"MgdDrawingService::GetCoordinateSpace()");
if (0 == resource)
{
- throw new MgNullArgumentException(L"MgDrawingService.GetCoordinateSpace", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdDrawingService.GetCoordinateSpace", __LINE__, __WFILE__, NULL, L"", NULL);
}
// Get the coordinate space from the resource content.
@@ -1320,7 +1320,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::GetCoordinateSpace")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::GetCoordinateSpace")
if (mgException != NULL)
{
@@ -1340,9 +1340,9 @@
//////////////////////////////////////////////////////////////////
/// <summary>
-/// Construct an MgDrawingService object
+/// Construct an MgdDrawingService object
/// </summary>
-MgDrawingService::MgDrawingService() :
+MgdDrawingService::MgdDrawingService() :
MgService(),
m_bOpenTempDwfFile(false),
m_bOpenTempW2dFile(false),
@@ -1361,7 +1361,7 @@
m_resourceService = static_cast<MgResourceService*>(fact->CreateService(MgServiceType::ResourceService));
assert(m_resourceService != NULL);
- MG_SERVER_DRAWING_SERVICE_CATCH_AND_THROW(L"MgDrawingService::MgDrawingService")
+ MG_SERVER_DRAWING_SERVICE_CATCH_AND_THROW(L"MgdDrawingService::MgdDrawingService")
}
@@ -1369,13 +1369,13 @@
/// <summary>
/// Destructor
/// </summary>
-MgDrawingService::~MgDrawingService()
+MgdDrawingService::~MgdDrawingService()
{
MG_SERVER_DRAWING_SERVICE_TRY()
CleanUpTempFiles();
- MG_SERVER_DRAWING_SERVICE_CATCH(L"MgDrawingService::~MgDrawingService")
+ MG_SERVER_DRAWING_SERVICE_CATCH(L"MgdDrawingService::~MgdDrawingService")
}
@@ -1386,7 +1386,7 @@
/// <returns>
/// Nothing
/// </returns>
-void MgDrawingService::CleanUpTempFiles()
+void MgdDrawingService::CleanUpTempFiles()
{
MgDrawingServiceUtil::CloseDrawingResource(m_bOpenTempDwfFile, m_tempDwfFileName);
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/DrawingService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -3,22 +3,22 @@
#include "MgDesktop.h"
-class MG_DESKTOP_API MgDrawingService : public MgService
+class MG_DESKTOP_API MgdDrawingService : public MgService
{
- DECLARE_CLASSNAME(MgDrawingService)
+ DECLARE_CLASSNAME(MgdDrawingService)
public:
//////////////////////////////////////////////////////////////////
/// <summary>
/// Destructor
/// </summary>
- virtual ~MgDrawingService();
+ virtual ~MgdDrawingService();
//////////////////////////////////////////////////////////////////
/// <summary>
- /// Construct an MgDrawingService object
+ /// Construct an MgdDrawingService object
/// </summary>
- MgDrawingService();
+ MgdDrawingService();
PUBLISHED_API:
//////////////////////////////////////////////////////////////////
@@ -60,13 +60,13 @@
//////////////////////////////////////////////////////////////////
/// <summary>
/// GetSection() returns a DWF containing only the requested section. The section is specified by resource identifier (to get the DWF from the repository),
- /// and the section name. The section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+ /// and the section name. The section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </summary>
/// <param name="resource">Input
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
- /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+ /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <returns>
/// Returns DWF stream containing the specified section.
@@ -89,8 +89,8 @@
/// GetSectionResource() extracts a specific resource from the DWF package.
/// It is specified by the resource identifier (to get the DWF from the repository)
/// and the resource name (to get the DWF resource from the DWF package).
- /// A list of resource names can be retrieved via call to MgDrawingServices::EnumerateSectionResources(),
- /// or from the manifest.xml via call to MgDrawingServices::DescribeDrawing().
+ /// A list of resource names can be retrieved via call to MgdDrawingServices::EnumerateSectionResources(),
+ /// or from the manifest.xml via call to MgdDrawingServices::DescribeDrawing().
/// Refer to the DWF Format Specification at http://viewers/web/Olema/pdf/DWF%206%20Corporate%20Publishing%20Format.pdf for more information resource files associated with a particular section.
///
/// </summary>
@@ -99,8 +99,8 @@
/// </param>
/// <param name="resourceName">Input
/// Unique resource name of an item in the DWF.
- /// The item's name can be retrieved from call to MgDrawingServices::EnumerateDrawingServices(),
- /// or from the manifest.xml via call to MgDrawingServices::DescribeDrawing().
+ /// The item's name can be retrieved from call to MgdDrawingServices::EnumerateDrawingServices(),
+ /// or from the manifest.xml via call to MgdDrawingServices::DescribeDrawing().
/// </param>
/// <returns>
/// Returns byte stream for the item.
@@ -124,15 +124,15 @@
/// <summary>
/// EnumerateLayers() returns the layer names in a DWF ePlot section. An ePlot section is also known as a "sheet" in DWF viewers.
/// The ePlot section is specified by resource identifier (to get the DWF from the repository), and section name.
- /// A list of all sections in a DWF can be retrieved from call to MgDrawingServices::EnumerateSections(),
- /// or from the manifest.xml via call to MgDrawingServices::DescribeDrawing().
+ /// A list of all sections in a DWF can be retrieved from call to MgdDrawingServices::EnumerateSections(),
+ /// or from the manifest.xml via call to MgdDrawingServices::DescribeDrawing().
// Refer to the DWF Format Specification at http://viewers/web/Olema/pdf/DWF%206%20Corporate%20Publishing%20Format.pdf for more information on the manifest and sections.
/// </summary>
/// <param name="resource">Input
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
- /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+ /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <returns>
/// Returns the pointer to a StringCollection of layer names.
@@ -157,10 +157,10 @@
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
- /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+ /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <param name="layerName">Input
- /// layerName specifies the name of the layer to retrieve from a particular section. A list of layer names can can be retrieved via call to MgDrawingService::EnumerateLayers().
+ /// layerName specifies the name of the layer to retrieve from a particular section. A list of layer names can can be retrieved via call to MgdDrawingService::EnumerateLayers().
/// </param>
/// <returns>
/// Returns DWF stream containing the specified layer (in a section)
@@ -205,13 +205,13 @@
/// <summary>
/// EnumerateSectionResources() enumerates the resources of a DWF section. The DWF is identified by it's
/// resource identifier and the section is identified by name. The section name
- /// will be retrieved from manifest.xml or from MgDrawingServices::EnumerateSections() API.
+ /// will be retrieved from manifest.xml or from MgdDrawingServices::EnumerateSections() API.
/// </summary>
/// <param name="resource">Input
/// MgResourceIdentifier object identifying the DWF resource
/// </param>
/// <param name="sectionName">Input
- /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgDrawingService::EnumerateSections() or from manifest.xml via call to MgDrawingService::DescribeDrawing().
+ /// sectionName specifies the unique name of the section in the DWF resource. Section names can be retrieved via call to MgdDrawingService::EnumerateSections() or from manifest.xml via call to MgdDrawingService::DescribeDrawing().
/// </param>
/// <returns>
/// Returns MgByteReader object representing resources in a DWF section.
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -73,7 +73,7 @@
m_svcFeature = dynamic_cast<MgFeatureService*>(fact->CreateService(MgServiceType::FeatureService));
assert(m_svcFeature != NULL);
- m_svcDrawing = dynamic_cast<MgDrawingService*>(fact->CreateService(MgServiceType::DrawingService));
+ m_svcDrawing = dynamic_cast<MgdDrawingService*>(fact->CreateService(MgServiceType::DrawingService));
assert(m_svcDrawing != NULL);
MgConfiguration* pConf = MgConfiguration::GetInstance();
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/MappingService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -27,7 +27,7 @@
//////////////////////////////////////////////////////////////////
/// <summary>
- /// Construct an MgDrawingService object
+ /// Construct an MgdDrawingService object
/// </summary>
MgdMappingService();
@@ -68,7 +68,7 @@
// member data
Ptr<MgFeatureService> m_svcFeature;
Ptr<MgResourceService> m_svcResource;
- Ptr<MgDrawingService> m_svcDrawing;
+ Ptr<MgdDrawingService> m_svcDrawing;
Ptr<MgCoordinateSystemFactory> m_pCSFactory;
// Mapping Service configuration properties
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -3,18 +3,18 @@
#include "ProfileRenderMapResult.h"
#include "SAX2Parser.h"
-MgProfilingService::MgProfilingService()
+MgdProfilingService::MgdProfilingService()
{
Ptr<MgServiceFactory> fact = new MgServiceFactory();
- m_svcRendering = static_cast<MgRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
+ m_svcRendering = static_cast<MgdRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
}
-MgProfilingService::~MgProfilingService()
+MgdProfilingService::~MgdProfilingService()
{
SAFE_RELEASE(m_svcRendering);
}
-MgByteReader* MgProfilingService::ProfileRenderDynamicOverlay(
+MgByteReader* MgdProfilingService::ProfileRenderDynamicOverlay(
MgdMap* map,
MgdSelection* selection,
MgRenderingOptions* options)
@@ -24,7 +24,7 @@
MG_TRY()
if (NULL == map)
- throw new MgNullArgumentException(L"MgProfilingService::ProfileRenderDynamicOverlay", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdProfilingService::ProfileRenderDynamicOverlay", __LINE__, __WFILE__, NULL, L"", NULL);
auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
@@ -44,13 +44,13 @@
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
- MG_CATCH_AND_THROW(L"MgProfilingService::ProfileRenderDynamicOverlay")
+ MG_CATCH_AND_THROW(L"MgdProfilingService::ProfileRenderDynamicOverlay")
return ret.Detach();
}
-MgByteReader* MgProfilingService::ProfileRenderMap(
+MgByteReader* MgdProfilingService::ProfileRenderMap(
MgdMap* map,
MgdSelection* selection,
MgCoordinate* center,
@@ -66,7 +66,7 @@
MG_TRY()
if (NULL == map)
- throw new MgNullArgumentException(L"MgProfilingService::ProfileRenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdProfilingService::ProfileRenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
auto_ptr<ProfileRenderMapResult> pPRMResult; // a pointer points to Profile Render Map Result
pPRMResult.reset(new ProfileRenderMapResult());
@@ -86,7 +86,7 @@
string content = parser.SerializeToXML(pPRMResult.get(),version.get());
ret = new MgByteReader(MgUtil::MultiByteToWideChar(content), MgMimeType::Xml);
- MG_CATCH_AND_THROW(L"MgProfilingService::ProfileRenderMap")
+ MG_CATCH_AND_THROW(L"MgdProfilingService::ProfileRenderMap")
return ret.Detach();
}
\ No newline at end of file
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ProfilingService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -4,15 +4,15 @@
#include "MgDesktop.h"
class MgRenderingOptions;
-class MgRenderingService;
+class MgdRenderingService;
-/// \defgroup MgProfilingService MgProfilingService
+/// \defgroup MgdProfilingService MgdProfilingService
/// \ingroup Profiling_Service_Module
/// \{
/// \brief
/// This class provides services to profile exsiting MapGuide APIs
-class MG_DESKTOP_API MgProfilingService : public MgService
+class MG_DESKTOP_API MgdProfilingService : public MgService
{
PUBLISHED_API:
@@ -92,10 +92,10 @@
/// \brief
/// Construct an MgProfileService object.
///
- MgProfilingService();
+ MgdProfilingService();
EXTERNAL_API:
- virtual ~MgProfilingService();
+ virtual ~MgdProfilingService();
protected:
@@ -118,7 +118,7 @@
virtual void Dispose() { delete this; }
private:
- MgRenderingService* m_svcRendering;
+ MgdRenderingService* m_svcRendering;
CLASS_ID:
static const INT32 m_cls_id = MapGuide_Desktop_ProfilingService_ProfilingService;
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -338,7 +338,7 @@
// render the layers.
void MgMappingUtil::StylizeLayers(MgResourceService* svcResource,
MgFeatureService* svcFeature,
- MgDrawingService* svcDrawing,
+ MgdDrawingService* svcDrawing,
MgCoordinateSystemFactory* csFactory,
MgdMap* map,
MgReadOnlyLayerCollection* layers,
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/Rendering/MappingUtil.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -13,7 +13,7 @@
class MgResourceService;
class MgFeatureService;
class MgFeatureReader;
-class MgDrawingService;
+class MgdDrawingService;
class MgCoordinateSystemFactory;
class MgResourceIdentifier;
class MgReadOnlyLayerCollection;
@@ -45,7 +45,7 @@
public:
static void StylizeLayers(MgResourceService* svcResource,
MgFeatureService* svcFeature,
- MgDrawingService* svcDrawing,
+ MgdDrawingService* svcDrawing,
MgCoordinateSystemFactory* csFactory,
MgdMap* map,
MgReadOnlyLayerCollection* layers,
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -46,7 +46,7 @@
///////////////////////////////////////////////////////////////////////////////
-MgRenderingService::MgRenderingService() : MgService()
+MgdRenderingService::MgdRenderingService() : MgService()
{
m_pCSFactory = new MgCoordinateSystemFactory();
@@ -58,7 +58,7 @@
m_svcFeature = dynamic_cast<MgFeatureService*>(fact->CreateService(MgServiceType::FeatureService));
assert(m_svcFeature != NULL);
- m_svcDrawing = dynamic_cast<MgDrawingService*>(fact->CreateService(MgServiceType::DrawingService));
+ m_svcDrawing = dynamic_cast<MgdDrawingService*>(fact->CreateService(MgServiceType::DrawingService));
assert(m_svcDrawing != NULL);
MgConfiguration* pConf = MgConfiguration::GetInstance();
@@ -117,14 +117,14 @@
///////////////////////////////////////////////////////////////////////////////
-MgRenderingService::~MgRenderingService()
+MgdRenderingService::~MgdRenderingService()
{
}
// ---------------------------------- BEGIN Rendering Service APIs ----------------------------------------------- //
///////////////////////////////////////////////////////////////////////////////
-MgByteReader* MgRenderingService::RenderTile(MgdMap* map, CREFSTRING baseMapLayerGroupName, INT32 tileColumn, INT32 tileRow)
+MgByteReader* MgdRenderingService::RenderTile(MgdMap* map, CREFSTRING baseMapLayerGroupName, INT32 tileColumn, INT32 tileRow)
{
Ptr<MgByteReader> ret;
@@ -144,10 +144,10 @@
MG_LOG_OPERATION_MESSAGE_ADD_INT32(tileRow);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderTile()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderTile()");
if (NULL == map || baseMapLayerGroupName.empty())
- throw new MgNullArgumentException(L"MgRenderingService.RenderTile", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderTile", __LINE__, __WFILE__, NULL, L"", NULL);
// find the finite display scale closest to the requested map scale
double scale = map->GetViewScale();
@@ -155,7 +155,7 @@
// if we don't find a nearest scale then something is wrong with the map
if (scaleIndex < 0)
- throw new MgInvalidMapDefinitionException(L"MgRenderingService.RenderTile", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgInvalidMapDefinitionException(L"MgdRenderingService.RenderTile", __LINE__, __WFILE__, NULL, L"", NULL);
// get the layer group associated with the name
Ptr<MgLayerGroupCollection> layerGroups = map->GetLayerGroups();
@@ -166,7 +166,7 @@
arguments.Add(L"2");
arguments.Add(baseMapLayerGroupName);
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderTile",
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderTile",
__LINE__, __WFILE__, &arguments, L"MgdMapLayerGroupNameNotFound", NULL);
}
@@ -206,7 +206,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderTile")
+ MG_CATCH(L"MgdRenderingService::RenderTile")
if (mgException != NULL)
{
@@ -226,7 +226,7 @@
///////////////////////////////////////////////////////////////////////////////
/// render a map using all layers from the baseGroup
-MgByteReader* MgRenderingService::RenderTile(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderTile(MgdMap* map,
MgLayerGroup* baseGroup,
INT32 scaleIndex,
INT32 width,
@@ -243,7 +243,7 @@
MG_TRY()
if (NULL == map || NULL == baseGroup)
- throw new MgNullArgumentException(L"MgRenderingService.RenderTile", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderTile", __LINE__, __WFILE__, NULL, L"", NULL);
// get map extent that corresponds to tile extent
RS_Bounds extent(mcsMinX, mcsMinY, mcsMaxX, mcsMaxY);
@@ -288,7 +288,7 @@
// restore the base group's visibility
baseGroup->SetVisible(groupVisible);
- MG_CATCH_AND_THROW(L"MgRenderingService.RenderTile")
+ MG_CATCH_AND_THROW(L"MgdRenderingService.RenderTile")
return ret.Detach();
}
@@ -296,7 +296,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bKeepSelection = true
-MgByteReader* MgRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, CREFSTRING format)
+MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, CREFSTRING format)
{
Ptr<MgByteReader> ret;
MG_LOG_OPERATION_MESSAGE(L"RenderDynamicOverlay");
@@ -313,7 +313,7 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(format.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderDynamicOverlay()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderDynamicOverlay()");
// Call updated RenderDynamicOverlay API
//ret = RenderDynamicOverlay(map, selection, format, true);
@@ -326,7 +326,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderDynamicOverlay")
+ MG_CATCH(L"MgdRenderingService::RenderDynamicOverlay")
if (mgException != NULL)
{
@@ -346,7 +346,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bKeepSelection = true
-MgByteReader* MgRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, CREFSTRING format, bool bKeepSelection)
+MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, CREFSTRING format, bool bKeepSelection)
{
Ptr<MgByteReader> ret;
@@ -366,7 +366,7 @@
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bKeepSelection);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderDynamicOverlay()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderDynamicOverlay()");
// Call updated RenderDynamicOverlay API
MgRenderingOptions options(format, MgRenderingOptions::RenderSelection |
@@ -376,7 +376,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderDynamicOverlay")
+ MG_CATCH(L"MgdRenderingService::RenderDynamicOverlay")
if (mgException != NULL)
{
@@ -397,7 +397,7 @@
///////////////////////////////////////////////////////////////////////////////
// called from API (first call of AjaxPgPViewerSampleApplication)
// default arg pPRMResult = NULL
-MgByteReader* MgRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, MgRenderingOptions* options)
+MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map, MgdSelection* selection, MgRenderingOptions* options)
{
Ptr<MgByteReader> ret;
@@ -415,7 +415,7 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"MgRenderingOptions");
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderDynamicOverlay()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderDynamicOverlay()");
// Call updated RenderDynamicOverlay API
ret = RenderDynamicOverlayInternal(map, selection, options, NULL);
@@ -423,7 +423,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderDynamicOverlay")
+ MG_CATCH(L"MgdRenderingService::RenderDynamicOverlay")
if (mgException != NULL)
{
@@ -444,7 +444,7 @@
///////////////////////////////////////////////////////////////////////////////
// Non-published RenderDynamicOverlay API with profile result parameter
// pPRMResult - a pointer points to Profile Render Map Result.
-MgByteReader* MgRenderingService::RenderDynamicOverlay(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderDynamicOverlay(MgdMap* map,
MgdSelection* selection,
MgRenderingOptions* options,
ProfileRenderMapResult* pPRMResult)
@@ -467,14 +467,14 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(L"ProfileRenderMapResult");
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderDynamicOverlay()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderDynamicOverlay()");
ret = RenderDynamicOverlayInternal(map, selection, options, pPRMResult);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderDynamicOverlay")
+ MG_CATCH(L"MgdRenderingService::RenderDynamicOverlay")
if (mgException != NULL)
{
@@ -491,7 +491,7 @@
return ret.Detach();
}
-MgByteReader* MgRenderingService::RenderDynamicOverlayInternal(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderDynamicOverlayInternal(MgdMap* map,
MgdSelection* selection,
MgRenderingOptions* options,
ProfileRenderMapResult* pPRMResult)
@@ -501,7 +501,7 @@
MG_TRY()
if (NULL == map)
- throw new MgNullArgumentException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"", NULL);
// validate map view parameters
int width = map->GetDisplayWidth();
@@ -511,23 +511,23 @@
double metersPerUnit = map->GetMetersPerUnit();
if (width <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
if (height <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
if (dpi <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapDisplayDpiCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapDisplayDpiCannotBeLessThanOrEqualToZero", NULL);
if (scale <= 0.0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapViewScaleCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapViewScaleCannotBeLessThanOrEqualToZero", NULL);
if (metersPerUnit <= 0.0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgdMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
if (width * height > MAX_PIXELS)
- throw new MgOutOfRangeException(L"MgRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
+ throw new MgOutOfRangeException(L"MgdRenderingService.RenderDynamicOverlayInternal", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
// compute map extent that corresponds to pixel extent
Ptr<MgPoint> pt = map->GetViewCenter();
@@ -572,7 +572,7 @@
// call the internal helper API to do all the stylization overhead work
ret = RenderMapInternal(map, selection, roLayers, dr.get(), width, height, width, height, scale, extent, false, options, true, pPRMResult);
- MG_CATCH(L"MgRenderingService.RenderDynamicOverlayInternal")
+ MG_CATCH(L"MgdRenderingService.RenderDynamicOverlayInternal")
if (mgException.p)
{
if(NULL != pPRMResult)
@@ -596,7 +596,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bKeepSelection = true
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
CREFSTRING format)
{
@@ -615,14 +615,14 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(format.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderMap()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderMap()");
ret = RenderMapPublished(map, selection, format, true, false);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderMap")
+ MG_CATCH(L"MgdRenderingService::RenderMap")
if (mgException != NULL)
{
@@ -642,7 +642,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bClip = false
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
CREFSTRING format,
bool bKeepSelection)
@@ -664,14 +664,14 @@
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bKeepSelection);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderMap()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderMap()");
ret = RenderMapPublished(map, selection, format, bKeepSelection, false);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderMap")
+ MG_CATCH(L"MgdRenderingService::RenderMap")
if (mgException != NULL)
{
@@ -693,7 +693,7 @@
// render complete map around center point in given scale using map's background
// color and display sizes as default arguments to call the real rendermap method
// default arg (bKeepSelection = true, bClip = false)
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
CREFSTRING format,
bool bKeepSelection,
@@ -718,14 +718,14 @@
MG_LOG_OPERATION_MESSAGE_ADD_BOOL(bClip);
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderMap()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderMap()");
ret = RenderMapPublished(map, selection, format, bKeepSelection, bClip);
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderMap")
+ MG_CATCH(L"MgdRenderingService::RenderMap")
if (mgException != NULL)
{
@@ -742,7 +742,7 @@
return ret.Detach();
}
-MgByteReader* MgRenderingService::RenderMapPublished(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMapPublished(MgdMap* map,
MgdSelection* selection,
CREFSTRING format,
bool bKeepSelection,
@@ -753,7 +753,7 @@
MG_TRY()
if (NULL == map)
- throw new MgNullArgumentException(L"MgRenderingService.RenderMapPublished", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderMapPublished", __LINE__, __WFILE__, NULL, L"", NULL);
Ptr<MgPoint> pt = map->GetViewCenter();
Ptr<MgCoordinate> center = pt->GetCoordinate();
@@ -767,7 +767,7 @@
// punt to more specific RenderMap API
ret = RenderMap(map, selection, center, scale, map->GetDisplayWidth(), map->GetDisplayHeight(), bgColor, format, bKeepSelection, bClip);
- MG_CATCH_AND_THROW(L"MgRenderingService.RenderMapPublished")
+ MG_CATCH_AND_THROW(L"MgdRenderingService.RenderMapPublished")
return ret.Detach();
}
@@ -775,7 +775,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arg bKeepSelection = true
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
MgEnvelope* extents,
INT32 width,
@@ -791,7 +791,7 @@
///////////////////////////////////////////////////////////////////////////////
// render the provided extent of the map and align aspect ratios to the provided window
// default arg bKeepSelection = true
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
MgEnvelope* extents,
INT32 width,
@@ -805,23 +805,23 @@
MG_TRY()
if (NULL == map || extents == NULL || backgroundColor == NULL)
- throw new MgNullArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
// validate map view parameters
int dpi = map->GetDisplayDpi();
double metersPerUnit = map->GetMetersPerUnit();
if (width <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
if (height <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
if (dpi <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayDpiCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayDpiCannotBeLessThanOrEqualToZero", NULL);
if (metersPerUnit <= 0.0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
// compute a view center and scale from the given extents
// and pass on to the RenderMap that uses center and scale
@@ -873,7 +873,7 @@
// sanity check - number of image pixels cannot exceed MAX_PIXELS
if (drawWidth * drawHeight > MAX_PIXELS)
- throw new MgOutOfRangeException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
+ throw new MgOutOfRangeException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
// use the supplied background color
RS_Color bgcolor(backgroundColor->GetRed(),
@@ -889,7 +889,7 @@
// call the internal helper API to do all the stylization overhead work
ret = RenderMapInternal(map, selection, NULL, dr.get(), drawWidth, drawHeight, width, height, format, scale, b, false, bKeepSelection, true);
- MG_CATCH_AND_THROW(L"MgRenderingService.RenderMap")
+ MG_CATCH_AND_THROW(L"MgdRenderingService.RenderMap")
return ret.Detach();
}
@@ -897,7 +897,7 @@
///////////////////////////////////////////////////////////////////////////////
// default argument bKeepSelection = true
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
MgCoordinate* center,
double scale,
@@ -913,7 +913,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arguments bClip = false pProfileRenderMapResult = NULL
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
MgCoordinate* center,
double scale,
@@ -928,7 +928,7 @@
///////////////////////////////////////////////////////////////////////////////
// default arguments bClip = false
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
MgCoordinate* center,
double scale,
@@ -946,7 +946,7 @@
// render map around center point in given scale
// default args bKeepSelection = true, bClip = false, backgroundColor = map->backgroundColor,
// width = map->getDisplayWidth, height = map->getDisplayHeight
-MgByteReader* MgRenderingService::RenderMap(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMap(MgdMap* map,
MgdSelection* selection,
MgCoordinate* center,
double scale,
@@ -963,30 +963,30 @@
MG_TRY()
if (NULL == map || NULL == center || NULL == backgroundColor)
- throw new MgNullArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"", NULL);
// validate map view parameters
int dpi = map->GetDisplayDpi();
double metersPerUnit = map->GetMetersPerUnit();
if (width <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
if (height <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
if (dpi <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayDpiCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapDisplayDpiCannotBeLessThanOrEqualToZero", NULL);
if (scale <= 0.0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapViewScaleCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapViewScaleCannotBeLessThanOrEqualToZero", NULL);
if (metersPerUnit <= 0.0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgdMapMetersPerUnitCannotBeLessThanOrEqualToZero", NULL);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
if (width * height > MAX_PIXELS)
- throw new MgOutOfRangeException(L"MgRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
+ throw new MgOutOfRangeException(L"MgdRenderingService.RenderMap", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
double unitsPerPixel = METERS_PER_INCH / (double)dpi / metersPerUnit;
double mapWidth2 = 0.5 * (double)width * unitsPerPixel * scale;
@@ -1020,7 +1020,7 @@
// call the internal helper API to do all the stylization overhead work
ret = RenderMapInternal(map, selection, NULL, dr.get(), width, height, width, height, format, scale, b, false, bKeepSelection, true, pPRMResult);
- MG_CATCH(L"MgRenderingService.RenderMap")
+ MG_CATCH(L"MgdRenderingService.RenderMap")
if (mgException.p)
{
if(NULL != pPRMResult)
@@ -1044,7 +1044,7 @@
///////////////////////////////////////////////////////////////////////////////
// pack options into object and forward call (select Selection AND Layers)
// maybe keepSelection called by RenderTile
-MgByteReader* MgRenderingService::RenderMapInternal(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMapInternal(MgdMap* map,
MgdSelection* selection,
MgReadOnlyLayerCollection* roLayers,
SE_Renderer* dr,
@@ -1073,7 +1073,7 @@
// (this is the baseGroup layers for rendering tiles)
// render map using provided options object from before
// this is called for tiles and for dynamic overlays
-MgByteReader* MgRenderingService::RenderMapInternal(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMapInternal(MgdMap* map,
MgdSelection* selection,
MgReadOnlyLayerCollection* roLayers,
SE_Renderer* dr,
@@ -1165,7 +1165,7 @@
RenderWatermarks(map,tempLayers,&ds, dr,drawWidth, drawHeight, saveWidth, saveHeight, pPRMResult);
}
- MG_CATCH(L"MgRenderingService.RenderMapInternal")
+ MG_CATCH(L"MgdRenderingService.RenderMapInternal")
if(NULL != pPRMResult)
{
@@ -1202,7 +1202,7 @@
///////////////////////////////////////////////////////////////////////////////
-MgByteReader* MgRenderingService::RenderMapLegend(MgdMap* map,
+MgByteReader* MgdRenderingService::RenderMapLegend(MgdMap* map,
INT32 width,
INT32 height,
MgColor* backgroundColor,
@@ -1227,21 +1227,21 @@
MG_LOG_OPERATION_MESSAGE_ADD_STRING(format.c_str());
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
- MG_LOG_TRACE_ENTRY(L"MgRenderingService::RenderMapLegend()");
+ MG_LOG_TRACE_ENTRY(L"MgdRenderingService::RenderMapLegend()");
if (NULL == map || NULL == backgroundColor)
- throw new MgNullArgumentException(L"MgRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"", NULL);
// validate map view parameters
if (width <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgdMapDisplayWidthCannotBeLessThanOrEqualToZero", NULL);
if (height <= 0)
- throw new MgInvalidArgumentException(L"MgRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
+ throw new MgInvalidArgumentException(L"MgdRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgdMapDisplayHeightCannotBeLessThanOrEqualToZero", NULL);
// sanity check - number of image pixels cannot exceed MAX_PIXELS
if (width * height > MAX_PIXELS)
- throw new MgOutOfRangeException(L"MgRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
+ throw new MgOutOfRangeException(L"MgdRenderingService.RenderMapLegend", __LINE__, __WFILE__, NULL, L"MgInvalidImageSizeTooBig", NULL);
RS_Color bgcolor(backgroundColor->GetRed(),
backgroundColor->GetGreen(),
@@ -1304,7 +1304,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgRenderingService::RenderMapLegend")
+ MG_CATCH(L"MgdRenderingService::RenderMapLegend")
if (mgException != NULL)
{
@@ -1322,7 +1322,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-SE_Renderer* MgRenderingService::CreateRenderer(int width,
+SE_Renderer* MgdRenderingService::CreateRenderer(int width,
int height,
RS_Color& bgColor,
bool requiresClipping,
@@ -1348,7 +1348,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-inline void MgRenderingService::RenderLayers(MgdMap* map,
+inline void MgdRenderingService::RenderLayers(MgdMap* map,
MgReadOnlyLayerCollection* layers,
Stylizer* ds,
Renderer* dr,
@@ -1384,7 +1384,7 @@
}
///////////////////////////////////////////////////////////////////////////////
-inline void MgRenderingService::RenderSelection(MgdMap* map,
+inline void MgdRenderingService::RenderSelection(MgdMap* map,
MgdSelection* selection,
MgReadOnlyLayerCollection* layers,
MgRenderingOptions* options,
@@ -1411,7 +1411,7 @@
Ptr<MgReadOnlyLayerCollection> selLayers = selection->GetLayers();
#ifdef _DEBUG
- printf("MgRenderingService::RenderSelection() - Layers:%d Selection Layers:%d\n", layers? layers->GetCount() : 0, selLayers.p? selLayers->GetCount() : 0);
+ printf("MgdRenderingService::RenderSelection() - Layers:%d Selection Layers:%d\n", layers? layers->GetCount() : 0, selLayers.p? selLayers->GetCount() : 0);
#endif
if (selLayers.p && selLayers->GetCount() > 0)
@@ -1471,7 +1471,7 @@
}
}
///////////////////////////////////////////////////////////////////////////////
-inline void MgRenderingService::RenderWatermarks(MgdMap* map,
+inline void MgdRenderingService::RenderWatermarks(MgdMap* map,
MgReadOnlyLayerCollection* layers,
Stylizer* ds,
Renderer* dr,
@@ -1651,7 +1651,7 @@
}
}
- MG_CATCH(L"MgRenderingService.RenderWatermarks")
+ MG_CATCH(L"MgdRenderingService.RenderWatermarks")
if(mgException.p)
{
// Do not do anything if fail in resource loading and has logged error.
@@ -1720,7 +1720,7 @@
}
////////////////////////////////////////////////////////////////////////////////
-inline MgByteReader* MgRenderingService::CreateImage(MgdMap* map,
+inline MgByteReader* MgdRenderingService::CreateImage(MgdMap* map,
Renderer* dr,
INT32 saveWidth,
INT32 saveHeight,
@@ -1777,7 +1777,7 @@
{
RS_ColorVector tileColorPalette;
MgMappingUtil::ParseColorStrings(&tileColorPalette, map);
-// printf("<<<<<<<<<<<<<<<<<<<<< MgRenderingService::ColorPalette->size(): %d\n", tileColorPalette.size());
+// printf("<<<<<<<<<<<<<<<<<<<<< MgdRenderingService::ColorPalette->size(): %d\n", tileColorPalette.size());
data.reset(((AGGRenderer*)dr)->Save(format, saveWidth, saveHeight, &tileColorPalette));
}
else
@@ -1807,7 +1807,7 @@
bs->SetMimeType(MgMimeType::Tiff);
}
else
- throw new MgNullReferenceException(L"MgRenderingService.CreateImage", __LINE__, __WFILE__, NULL, L"MgNoDataFromRenderer", NULL);
+ throw new MgNullReferenceException(L"MgdRenderingService.CreateImage", __LINE__, __WFILE__, NULL, L"MgNoDataFromRenderer", NULL);
if(NULL != pPRMResult)
{
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -5,7 +5,7 @@
class SE_Renderer;
class MgRenderingOptions;
class FeatureInfoRenderer;
-class MgDrawingService;
+class MgdDrawingService;
struct RS_Bounds;
class RS_Color;
class Stylizer;
@@ -17,18 +17,18 @@
class ProfileRenderMapResult;
}
-template class Ptr<MgDrawingService>;
+template class Ptr<MgdDrawingService>;
-//NOTE: Despite MgRenderingService not defined in PlatformBase, we don't want a naming collision
+//NOTE: Despite MgdRenderingService not defined in PlatformBase, we don't want a naming collision
//if this library and MapGuideCommon happend to be linked together
-class MG_DESKTOP_API MgRenderingService : public MgService
+class MG_DESKTOP_API MgdRenderingService : public MgService
{
- DECLARE_CLASSNAME(MgRenderingService)
+ DECLARE_CLASSNAME(MgdRenderingService)
public:
- MgRenderingService();
- ~MgRenderingService();
+ MgdRenderingService();
+ ~MgdRenderingService();
DECLARE_CREATE_SERVICE()
@@ -256,7 +256,7 @@
// member data
Ptr<MgFeatureService> m_svcFeature;
Ptr<MgResourceService> m_svcResource;
- Ptr<MgDrawingService> m_svcDrawing;
+ Ptr<MgdDrawingService> m_svcDrawing;
Ptr<MgCoordinateSystemFactory> m_pCSFactory;
// this will eventually be removed
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -58,30 +58,30 @@
switch(serviceType)
{
case MgServiceType::DrawingService:
- return new MgDrawingService();
+ return new MgdDrawingService();
case MgServiceType::FeatureService:
return new MgdFeatureService();
case MgServiceType::MappingService:
return new MgdMappingService();
case MgServiceType::ProfilingService:
- return new MgProfilingService();
+ return new MgdProfilingService();
case MgServiceType::RenderingService:
- return new MgRenderingService();
+ return new MgdRenderingService();
case MgServiceType::ResourceService:
return new MgdResourceService(sm_libContentPath,
sm_libDataPath,
sm_sesContentPath,
sm_sesDataPath);
case MgServiceType::TileService:
- return new MgTileService();
+ return new MgdTileService();
}
throw new MgServiceNotSupportedException(L"MgServiceFactory::CreateService", __LINE__, __WFILE__, NULL, L"", NULL);
}
/*
-MgTileService* MgServiceFactory::CreateTileService()
+MgdTileService* MgServiceFactory::CreateTileService()
{
- return new MgTileService();
+ return new MgdTileService();
}
MgdFeatureService* MgServiceFactory::CreateFeatureService()
@@ -97,13 +97,13 @@
sm_sesDataPath);
}
-MgDrawingService* MgServiceFactory::CreateDrawingService()
+MgdDrawingService* MgServiceFactory::CreateDrawingService()
{
- return new MgDrawingService();
+ return new MgdDrawingService();
}
-MgRenderingService* MgServiceFactory::CreateRenderingService()
+MgdRenderingService* MgServiceFactory::CreateRenderingService()
{
- return new MgRenderingService();
+ return new MgdRenderingService();
}
*/
\ No newline at end of file
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/ServiceFactory.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -2,12 +2,12 @@
#define DESKTOP_SERVICE_FACTORY_H
class MgService;
-class MgTileService;
+class MgdTileService;
class MgdFeatureService;
class MgdMappingService;
class MgdResourceService;
-class MgDrawingService;
-class MgRenderingService;
+class MgdDrawingService;
+class MgdRenderingService;
class MG_DESKTOP_API MgServiceFactory : public MgGuardDisposable
{
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -1,15 +1,15 @@
#include "MgDesktop.h"
#include "TileService.h"
-ACE_Recursive_Thread_Mutex MgTileService::sm_mutex;
-bool MgTileService::sm_initialized = false;
-MgTileService::MapCache MgTileService::sm_mapCache;
-bool MgTileService::sm_renderOnly = false;
-INT32 MgTileService::sm_creationCutoffTime = 120; // in seconds
-INT32 MgTileService::sm_pollingInterval = 1; // in seconds
-INT32 MgTileService::sm_mapCacheSize = 10;
+ACE_Recursive_Thread_Mutex MgdTileService::sm_mutex;
+bool MgdTileService::sm_initialized = false;
+MgdTileService::MapCache MgdTileService::sm_mapCache;
+bool MgdTileService::sm_renderOnly = false;
+INT32 MgdTileService::sm_creationCutoffTime = 120; // in seconds
+INT32 MgdTileService::sm_pollingInterval = 1; // in seconds
+INT32 MgdTileService::sm_mapCacheSize = 10;
-MgTileService::MgTileService() : MgService()
+MgdTileService::MgdTileService() : MgService()
{
if (!sm_initialized)
{
@@ -53,7 +53,7 @@
}
-MgTileService::~MgTileService()
+MgdTileService::~MgdTileService()
{
}
@@ -61,7 +61,7 @@
/// \brief
/// Determine if the tile cache is empty.
///
-bool MgTileService::IsTileCacheEmpty() const
+bool MgdTileService::IsTileCacheEmpty() const
{
ACE_MT(ACE_GUARD_RETURN(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex, false));
@@ -72,7 +72,7 @@
/// \brief
/// Detect if the tile file has been locked by another thread or process.
///
-bool MgTileService::DetectTileLockFile(CREFSTRING lockPathname)
+bool MgdTileService::DetectTileLockFile(CREFSTRING lockPathname)
{
bool found = false;
struct _stat lockFileInfo;
@@ -103,7 +103,7 @@
// Create tilename from mapDefinition, scaleIndex, row, and column.
// Remove lockfile, look for the tile in the cache, if not in cache create
// lockfile and look for map in mapcache.
-MgByteReader* MgTileService::GetTile(MgResourceIdentifier* mapDefinition,
+MgByteReader* MgdTileService::GetTile(MgResourceIdentifier* mapDefinition,
CREFSTRING baseMapLayerGroupName,
INT32 tileColumn,
INT32 tileRow,
@@ -132,7 +132,7 @@
if (NULL == mapDefinition || baseMapLayerGroupName.empty())
{
- throw new MgNullArgumentException(L"MgTileService.GetTile",
+ throw new MgNullArgumentException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, NULL, L"", NULL);
}
@@ -145,13 +145,13 @@
arguments.Add(L"5");
arguments.Add(buffer);
- throw new MgInvalidArgumentException(L"MgTileService.GetTile",
+ throw new MgInvalidArgumentException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, &arguments, L"MgInvalidScaleIndex", NULL);
}
// get the service from our helper method
Ptr<MgResourceService> resourceService = GetResourceServiceForMapDef(mapDefinition,
- L"MgTileService.GetTile");
+ L"MgdTileService.GetTile");
// Generate tile and lock pathnames.
m_tileCache->GeneratePathnames(mapDefinition, scaleIndex, baseMapLayerGroupName,
tileColumn, tileRow, tilePathname, lockPathname, false);
@@ -189,7 +189,7 @@
MgStringCollection arguments;
arguments.Add(lockPathname);
- throw new MgFileIoException(L"MgTileService.GetTile",
+ throw new MgFileIoException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, &arguments, L"MgUnableToLockTileFile", NULL);
}
@@ -210,7 +210,7 @@
MgStringCollection arguments;
arguments.Add(lockPathname);
- throw new MgFileIoException(L"MgTileService.GetTile",
+ throw new MgFileIoException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, &arguments, L"MgUnableToOpenLockFile", NULL);
}
else
@@ -257,7 +257,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgTileService::GetTile")
+ MG_CATCH(L"MgdTileService::GetTile")
if (mgException != NULL)
{
@@ -282,7 +282,7 @@
///////////////////////////////////////////////////////////////////////////////
// look for the tile in the tilecache first
-MgByteReader* MgTileService::GetTile(MgdMap* map,
+MgByteReader* MgdTileService::GetTile(MgdMap* map,
CREFSTRING baseMapLayerGroupName,
INT32 tileColumn,
INT32 tileRow)
@@ -311,7 +311,7 @@
if (NULL == map || baseMapLayerGroupName.empty())
{
- throw new MgNullArgumentException(L"MgTileService.GetTile",
+ throw new MgNullArgumentException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, NULL, L"", NULL);
}
@@ -322,7 +322,7 @@
// if we don't find a nearest scale then something is wrong with the map
if (scaleIndex < 0)
{
- throw new MgInvalidMapDefinitionException(L"MgTileService.GetTile",
+ throw new MgInvalidMapDefinitionException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, NULL, L"", NULL);
}
@@ -354,7 +354,7 @@
MgStringCollection arguments;
arguments.Add(lockPathname);
- throw new MgFileIoException(L"MgTileService.GetTile",
+ throw new MgFileIoException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, &arguments, L"MgUnableToLockTileFile", NULL);
}
@@ -375,7 +375,7 @@
MgStringCollection arguments;
arguments.Add(lockPathname);
- throw new MgFileIoException(L"MgTileService.GetTile",
+ throw new MgFileIoException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, &arguments, L"MgUnableToOpenLockFile", NULL);
}
else
@@ -392,7 +392,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgTileService::GetTile")
+ MG_CATCH(L"MgdTileService::GetTile")
if (mgException != NULL)
{
@@ -417,14 +417,14 @@
///////////////////////////////////////////////////////////////////////////////
// render a tile and store it in the cache
-MgByteReader* MgTileService::GetTile(CREFSTRING tilePathname, MgdMap* map, INT32 scaleIndex,
+MgByteReader* MgdTileService::GetTile(CREFSTRING tilePathname, MgdMap* map, INT32 scaleIndex,
CREFSTRING baseMapLayerGroupName, INT32 tileColumn, INT32 tileRow)
{
Ptr<MgByteReader> img;
// get a rendering service instance
Ptr<MgServiceFactory> fact = new MgServiceFactory();
- Ptr<MgRenderingService> svcRendering = static_cast<MgRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
+ Ptr<MgdRenderingService> svcRendering = static_cast<MgdRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
assert(NULL != svcRendering);
if (svcRendering != NULL)
@@ -451,7 +451,7 @@
///////////////////////////////////////////////////////////////////////////////
// take a tile image and store it in the tilecache using lockfiles
-void MgTileService::SetTile(MgByteReader* img,
+void MgdTileService::SetTile(MgByteReader* img,
MgdMap* map,
INT32 scaleIndex,
CREFSTRING baseMapLayerGroupName,
@@ -465,7 +465,7 @@
if (NULL == img || NULL == map || baseMapLayerGroupName.empty())
{
- throw new MgNullArgumentException(L"MgTileService.SetTile",
+ throw new MgNullArgumentException(L"MgdTileService.SetTile",
__LINE__, __WFILE__, NULL, L"", NULL);
}
@@ -478,7 +478,7 @@
arguments.Add(L"3");
arguments.Add(buffer);
- throw new MgInvalidArgumentException(L"MgTileService.GetTile",
+ throw new MgInvalidArgumentException(L"MgdTileService.GetTile",
__LINE__, __WFILE__, &arguments, L"MgInvalidScaleIndex", NULL);
}
@@ -504,7 +504,7 @@
MgStringCollection arguments;
arguments.Add(lockPathname);
- throw new MgFileIoException(L"MgTileService.SetTile",
+ throw new MgFileIoException(L"MgdTileService.SetTile",
__LINE__, __WFILE__, &arguments, L"MgUnableToOpenLockFile", NULL);
}
else
@@ -516,7 +516,7 @@
// cache the tile
m_tileCache->Set(img, tilePathname);
- MG_CATCH(L"MgTileService.SetTile")
+ MG_CATCH(L"MgdTileService.SetTile")
if (NULL != lockFile)
{
@@ -529,7 +529,7 @@
///////////////////////////////////////////////////////////////////////////////
// accessor method for resource service
-MgResourceService* MgTileService::GetResourceServiceForMapDef(MgResourceIdentifier* mapDefinition,
+MgResourceService* MgdTileService::GetResourceServiceForMapDef(MgResourceIdentifier* mapDefinition,
CREFSTRING funcName)
{
// Get the service from service manager
@@ -552,7 +552,7 @@
///////////////////////////////////////////////////////////////////////////////
-void MgTileService::ClearCache(MgdMap* map)
+void MgdTileService::ClearCache(MgdMap* map)
{
MG_LOG_OPERATION_MESSAGE(L"ClearCache");
@@ -567,7 +567,7 @@
MG_LOG_OPERATION_MESSAGE_PARAMETERS_END();
if (NULL == map)
- throw new MgNullArgumentException(L"MgTileService.ClearCache", __LINE__, __WFILE__, NULL, L"", NULL);
+ throw new MgNullArgumentException(L"MgdTileService.ClearCache", __LINE__, __WFILE__, NULL, L"", NULL);
ClearMapCache(resourceId->ToString());
@@ -576,7 +576,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgTileService::ClearCache")
+ MG_CATCH(L"MgdTileService::ClearCache")
if (mgException != NULL)
{
@@ -598,7 +598,7 @@
/// Any tile cache associated with the specified Map Definition resources
/// will be cleared.
///
-bool MgTileService::NotifyResourcesChanged(MgSerializableCollection* resources, bool strict)
+bool MgdTileService::NotifyResourcesChanged(MgSerializableCollection* resources, bool strict)
{
bool success = true;
@@ -625,7 +625,7 @@
// clear any tile cache associated with this map
m_tileCache->Clear(resource);
- MG_CATCH(L"MgTileService.NotifyResourcesChanged")
+ MG_CATCH(L"MgdTileService.NotifyResourcesChanged")
if (NULL != mgException.p)
{
@@ -653,14 +653,14 @@
///////////////////////////////////////////////////////////////////////////////
-void MgTileService::SetConnectionProperties(MgConnectionProperties*)
+void MgdTileService::SetConnectionProperties(MgConnectionProperties*)
{
// Do nothing. No connection properties are required for Server-side service objects.
}
///////////////////////////////////////////////////////////////////////////////
-void MgTileService::ClearMapCache(CREFSTRING mapDefinition)
+void MgdTileService::ClearMapCache(CREFSTRING mapDefinition)
{
ACE_MT(ACE_GUARD(ACE_Recursive_Thread_Mutex, ace_mon, sm_mutex));
MapCache::iterator iter = sm_mapCache.end();
@@ -698,7 +698,7 @@
///////////////////////////////////////////////////////////////////////////////
-INT32 MgTileService::GetDefaultTileSizeX()
+INT32 MgdTileService::GetDefaultTileSizeX()
{
INT32 ret = 0;
MG_LOG_OPERATION_MESSAGE(L"GetDefaultTileSizeX");
@@ -714,7 +714,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgTileService::GetDefaultTileSizeX")
+ MG_CATCH(L"MgdTileService::GetDefaultTileSizeX")
if (mgException != NULL)
{
@@ -732,7 +732,7 @@
///////////////////////////////////////////////////////////////////////////////
-INT32 MgTileService::GetDefaultTileSizeY()
+INT32 MgdTileService::GetDefaultTileSizeY()
{
INT32 ret = 0;
MG_LOG_OPERATION_MESSAGE(L"GetDefaultTileSizeY");
@@ -748,7 +748,7 @@
// Successful operation
MG_LOG_OPERATION_MESSAGE_ADD_STRING(MgResources::Success.c_str());
- MG_CATCH(L"MgTileService::GetDefaultTileSizeY")
+ MG_CATCH(L"MgdTileService::GetDefaultTileSizeY")
if (mgException != NULL)
{
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/TileService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -3,15 +3,15 @@
#include "Tile/TileCache.h"
-class MG_DESKTOP_API MgTileService : public MgService
+class MG_DESKTOP_API MgdTileService : public MgService
{
- DECLARE_CLASSNAME(MgTileService)
+ DECLARE_CLASSNAME(MgdTileService)
INTERNAL_API:
- MgTileService();
+ MgdTileService();
EXTERNAL_API:
- virtual ~MgTileService();
+ virtual ~MgdTileService();
PUBLISHED_API:
virtual MgByteReader* GetTile(MgdMap* map,
Modified: branches/2.4/MgDev/Desktop/SampleExtension/MgProfileComponent.cs
===================================================================
--- branches/2.4/MgDev/Desktop/SampleExtension/MgProfileComponent.cs 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/SampleExtension/MgProfileComponent.cs 2012-06-05 11:55:19 UTC (rev 6732)
@@ -17,7 +17,7 @@
{
var provider = this.Viewer.GetProvider();
var map = this.Viewer.GetMap();
- var prof = (MgProfilingService)provider.CreateService(MgServiceType.ProfilingService);
+ var prof = (MgdProfilingService)provider.CreateService(MgServiceType.ProfilingService);
var opts = new MgRenderingOptions("PNG", 2, new MgColor(this.Viewer.SelectionColor));
var result = prof.ProfileRenderDynamicOverlay((MgdMap)map, (MgdSelection)this.Viewer.GetSelection(), opts);
new XmlResponseDialog(result).ShowDialog();
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -32,7 +32,7 @@
factory->CreateService(MgServiceType::ResourceService));
assert(m_svcResource != NULL);
- m_svcProfiling = dynamic_cast<MgProfilingService*>(
+ m_svcProfiling = dynamic_cast<MgdProfilingService*>(
factory->CreateService(MgServiceType::ProfilingService));
assert(m_svcProfiling != NULL);
}
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestProfilingService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -50,7 +50,7 @@
private:
Ptr<MgResourceService> m_svcResource;
- Ptr<MgProfilingService> m_svcProfiling;
+ Ptr<MgdProfilingService> m_svcProfiling;
};
#endif // _TESTPROFILINGSERVICE_H
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -32,7 +32,7 @@
// Initialize service objects.
m_svcResource = static_cast<MgResourceService*>(fact->CreateService(MgServiceType::ResourceService));
- m_svcRendering = static_cast<MgRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
+ m_svcRendering = static_cast<MgdRenderingService*>(fact->CreateService(MgServiceType::RenderingService));
}
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestRenderingService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -80,7 +80,7 @@
private:
Ptr<MgResourceService> m_svcResource;
- Ptr<MgRenderingService> m_svcRendering;
+ Ptr<MgdRenderingService> m_svcRendering;
};
#endif // _TESTRENDERINGSERVICE_H
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestTileService.cpp
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestTileService.cpp 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestTileService.cpp 2012-06-05 11:55:19 UTC (rev 6732)
@@ -42,7 +42,7 @@
m_svcResource = static_cast<MgResourceService*>(fact->CreateService(MgServiceType::ResourceService));
assert(m_svcResource != NULL);
- m_svcTile = static_cast<MgTileService*>(fact->CreateService(MgServiceType::TileService));
+ m_svcTile = static_cast<MgdTileService*>(fact->CreateService(MgServiceType::TileService));
assert(m_svcTile != NULL);
}
@@ -244,7 +244,7 @@
{
// get the tile service instance
Ptr<MgServiceFactory> fact = new MgServiceFactory();
- Ptr<MgTileService> svcTile = static_cast<MgTileService*>(fact->CreateService(MgServiceType::TileService));
+ Ptr<MgdTileService> svcTile = static_cast<MgdTileService*>(fact->CreateService(MgServiceType::TileService));
assert(svcTile != NULL);
// get the tile
@@ -441,7 +441,7 @@
{
// get the tile service instance
Ptr<MgServiceFactory> fact = new MgServiceFactory();
- Ptr<MgTileService> svcTile = static_cast<MgTileService*>(fact->CreateService(MgServiceType::TileService));
+ Ptr<MgdTileService> svcTile = static_cast<MgdTileService*>(fact->CreateService(MgServiceType::TileService));
assert(svcTile != NULL);
// find the finite display scale closest to the requested map scale
Modified: branches/2.4/MgDev/Desktop/UnitTest/TestTileService.h
===================================================================
--- branches/2.4/MgDev/Desktop/UnitTest/TestTileService.h 2012-06-05 11:26:26 UTC (rev 6731)
+++ branches/2.4/MgDev/Desktop/UnitTest/TestTileService.h 2012-06-05 11:55:19 UTC (rev 6732)
@@ -53,7 +53,7 @@
private:
Ptr<MgResourceService> m_svcResource;
- Ptr<MgTileService> m_svcTile;
+ Ptr<MgdTileService> m_svcTile;
};
#endif
More information about the mapguide-commits
mailing list