[mapguide-commits] r6697 - in branches/2.4/MgDev/Desktop:
DesktopUnmanagedApi/DotNet MgDesktop/Services
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri May 25 04:57:18 PDT 2012
Author: jng
Date: 2012-05-25 04:57:18 -0700 (Fri, 25 May 2012)
New Revision: 6697
Modified:
branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml
branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml
branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h
Log:
mg-desktop: API exposure cleanup
Modified: branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml
===================================================================
--- branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml 2012-05-25 10:35:34 UTC (rev 6696)
+++ branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopApiGen.xml 2012-05-25 11:57:18 UTC (rev 6697)
@@ -95,7 +95,13 @@
<Header path="../../MgDesktop/Exception/DwfSectionResourceNotFoundException.h" />
<Header path="../../MgDesktop/Exception/InvalidDwfPackageException.h" />
<Header path="../../MgDesktop/Exception/InvalidDwfSectionException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidFeatureSourceException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidLogEntryException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidPrintLayoutFontSizeUnitsException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidPrintLayoutPositionUnitsException.h" />
+ <Header path="../../MgDesktop/Exception/InvalidPrintLayoutSizeUnitsException.h" />
<Header path="../../MgDesktop/Exception/ParameterNotFoundException.h" />
+ <Header path="../../MgDesktop/Exception/StylizeLayerFailedException.h" />
<Header path="../../MgDesktop/Services/DataReader.h" />
<Header path="../../MgDesktop/Services/DrawingService.h" />
Modified: branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml
===================================================================
--- branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml 2012-05-25 10:35:34 UTC (rev 6696)
+++ branches/2.4/MgDev/Desktop/DesktopUnmanagedApi/DotNet/MapGuideDesktopConstants.xml 2012-05-25 11:57:18 UTC (rev 6697)
@@ -77,7 +77,6 @@
<Class name="MgUnitType" />
<Class name="MgPageUnitsType" />
<Class name="MgImageFormats" />
- <Class name="MgConfigProperties" />
</Classes>
<!--
@@ -88,7 +87,6 @@
<Header path="../../MgDesktop/Services/ImageFormats.h" />
<Header path="../../MgDesktop/Services/Rendering/MapPlotInstruction.h" />
<Header path="../../MgDesktop/Services/Rendering/UnitType.h" />
- <Header path="../../MgDesktop/System/ConfigProperties.h" />
</Headers>
</Parameters>
Modified: branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h
===================================================================
--- branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2012-05-25 10:35:34 UTC (rev 6696)
+++ branches/2.4/MgDev/Desktop/MgDesktop/Services/RenderingService.h 2012-05-25 11:57:18 UTC (rev 6697)
@@ -58,11 +58,6 @@
MgdSelection* selection,
MgRenderingOptions* options);
- virtual MgByteReader* RenderDynamicOverlay(MgdMap* map,
- MgdSelection* selection,
- MgRenderingOptions* options,
- ProfileRenderMapResult* pPRMResult);
-
virtual MgByteReader* RenderMap(MgdMap* map,
MgdSelection* selection,
CREFSTRING format);
@@ -121,6 +116,11 @@
INTERNAL_API:
+ virtual MgByteReader* RenderDynamicOverlay(MgdMap* map,
+ MgdSelection* selection,
+ MgRenderingOptions* options,
+ MdfModel::ProfileRenderMapResult* pPRMResult);
+
virtual MgByteReader* RenderMap(MgdMap* map,
MgdSelection* selection,
MgEnvelope* extents,
@@ -166,7 +166,7 @@
MgColor* backgroundColor,
CREFSTRING format,
bool bKeepSelection,
- ProfileRenderMapResult* pPRMResult);
+ MdfModel::ProfileRenderMapResult* pPRMResult);
virtual MgByteReader* RenderMap(MgdMap* map,
MgdSelection* selection,
@@ -178,7 +178,7 @@
CREFSTRING format,
bool bKeepSelection,
bool bClip,
- ProfileRenderMapResult* pPRMResult = NULL);
+ MdfModel::ProfileRenderMapResult* pPRMResult = NULL);
private:
// used for tile generation
@@ -198,7 +198,7 @@
MgByteReader* RenderDynamicOverlayInternal(MgdMap* map,
MgdSelection* selection,
MgRenderingOptions* options,
- ProfileRenderMapResult* pPRMResult);
+ MdfModel::ProfileRenderMapResult* pPRMResult);
// Internal help called by our PUBLISHED_API versions of RenderMap
MgByteReader* RenderMapPublished(MgdMap* map,
@@ -222,7 +222,7 @@
bool expandExtents,
bool bKeepSelection,
bool renderWatermark,
- ProfileRenderMapResult* pPRMResult = NULL);
+ MdfModel::ProfileRenderMapResult* pPRMResult = NULL);
MgByteReader* RenderMapInternal(MgdMap* map,
MgdSelection* selection,
@@ -237,7 +237,7 @@
bool expandExtents,
MgRenderingOptions* options,
bool renderWatermark,
- ProfileRenderMapResult* pPRMResult = NULL);
+ MdfModel::ProfileRenderMapResult* pPRMResult = NULL);
void RenderForSelection(MgMap* map,
MgStringCollection* layerNames,
@@ -263,7 +263,7 @@
bool expandExtents,
double scale,
CREFSTRING format,
- ProfileRenderMapResult* pPRMResult);
+ MdfModel::ProfileRenderMapResult* pPRMResult);
void RenderSelection(MgdMap* map,
MgdSelection* selection,
@@ -274,7 +274,7 @@
MgCoordinateSystem* dstCs,
double scale,
INT32 behavior,
- ProfileRenderMapResult* pPRMResult);
+ MdfModel::ProfileRenderMapResult* pPRMResult);
void RenderWatermarks(MgdMap* map,
MgReadOnlyLayerCollection* layers,
@@ -284,14 +284,14 @@
int drawHeight,
INT32 saveWidth,
INT32 saveHeight,
- ProfileRenderMapResult* pPRMResult);
+ MdfModel::ProfileRenderMapResult* pPRMResult);
MgByteReader* CreateImage(MgdMap* map,
Renderer* dr,
INT32 saveWidth,
INT32 saveHeight,
CREFSTRING format,
- ProfileRenderMapResult* pPRMResult);
+ MdfModel::ProfileRenderMapResult* pPRMResult);
// member data
Ptr<MgFeatureService> m_svcFeature;
More information about the mapguide-commits
mailing list