[mapguide-commits] r6821 - in trunk/Tools/Maestro: Maestro.AddIn.Local Maestro.AddIn.Local/UI OSGeo.MapGuide.MaestroAPI.Local

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-06-26 09:18:13 -0700 (Tue, 26 Jun 2012)
New Revision: 6821

Modified:
   trunk/Tools/Maestro/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgFoundation.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGeometry.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsCommon.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsQueryEngine.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsResource.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfModel.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfParser.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgPlatformBase.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgRenderers.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/MgStylization.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
   trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
Log:
Interim mg-desktop binary update for Maestro.

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/FoundationUnmanagedApi.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/GeometryUnmanagedApi.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MapGuideDesktopUnmanagedApi.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgDesktop.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgFoundation.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGeometry.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsCommon.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsQueryEngine.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgGwsResource.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfModel.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgMdfParser.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgPlatformBase.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgRenderers.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/MgStylization.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Desktop.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Foundation.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Geometry.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.PlatformBase.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.Desktop.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/OSGeo.MapGuide.Viewer.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/PlatformBaseUnmanagedApi.dll
===================================================================
(Binary files differ)

Modified: trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2012-06-26 15:58:43 UTC (rev 6820)
+++ trunk/Tools/Maestro/Maestro.AddIn.Local/UI/MapPreviewWindow.cs	2012-06-26 16:18:13 UTC (rev 6821)
@@ -68,11 +68,7 @@
                 }
             }
             var fact = new MgServiceFactory();
-            viewer.Init(
-                new MgDesktopMapViewerProvider(
-                    _map, 
-                    (MgdResourceService)fact.CreateService(MgServiceType.ResourceService), 
-                    (MgRenderingService)fact.CreateService(MgServiceType.RenderingService)));
+            viewer.Init(new MgDesktopMapViewerProvider(_map));
             viewer.RefreshMap();
         }
 

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2012-06-26 15:58:43 UTC (rev 6820)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI.Local/LocalConnection.cs	2012-06-26 16:18:13 UTC (rev 6821)
@@ -138,9 +138,10 @@
 
         private MgdResourceService _resSvc;
         private MgdFeatureService _featSvc;
-        private MgDrawingService _drawSvc;
-        private MgRenderingService _renderSvc;
-        private MgTileService _tileSvc;
+        private MgdDrawingService _drawSvc;
+        private MgdMappingService _mappingSvc;
+        private MgdRenderingService _renderSvc;
+        private MgdTileService _tileSvc;
 
         public override void Dispose()
         {
@@ -191,26 +192,34 @@
             return _featSvc;
         }
 
-        private MgDrawingService GetDrawingService()
+        private MgdDrawingService GetDrawingService()
         {
             if (_drawSvc == null)
-                _drawSvc = (MgDrawingService)_fact.CreateService(MgServiceType.DrawingService);
+                _drawSvc = (MgdDrawingService)_fact.CreateService(MgServiceType.DrawingService);
 
             return _drawSvc;
         }
 
-        private MgRenderingService GetRenderingService()
+        private MgdMappingService GetMappingService()
         {
+            if (_mappingSvc == null)
+                _mappingSvc = (MgdMappingService)_fact.CreateService(MgServiceType.MappingService);
+
+            return _mappingSvc;
+        }
+
+        private MgdRenderingService GetRenderingService()
+        {
             if (_renderSvc == null)
-                _renderSvc = (MgRenderingService)_fact.CreateService(MgServiceType.RenderingService);
+                _renderSvc = (MgdRenderingService)_fact.CreateService(MgServiceType.RenderingService);
 
             return _renderSvc;
         }
 
-        private MgTileService GetTileService()
+        private MgdTileService GetTileService()
         {
             if (_tileSvc == null)
-                _tileSvc = (MgTileService)_fact.CreateService(MgServiceType.TileService);
+                _tileSvc = (MgdTileService)_fact.CreateService(MgServiceType.TileService);
 
             return _tileSvc;
         }
@@ -1191,11 +1200,11 @@
 
         public System.Drawing.Image GetLegendImage(double scale, string layerdefinition, int themeIndex, int type, int width, int height, string format)
         {
-            var renderSvc = GetRenderingService();
+            var mappingSvc = GetMappingService();
             GetByteReaderMethod fetch = () =>
             {
                 MgResourceIdentifier resId = new MgResourceIdentifier(layerdefinition);
-                return renderSvc.GenerateLegendImage(resId, scale, width, height, format, type, themeIndex);
+                return mappingSvc.GenerateLegendImage(resId, scale, width, height, format, type, themeIndex);
             };
             return new System.Drawing.Bitmap(new MgReadOnlyStream(fetch));
         }