[mapguide-commits] r6660 - in branches/maestro-4.0.x: Maestro MgCooker

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-17 08:31:21 -0700 (Thu, 17 May 2012)
New Revision: 6660

Modified:
   branches/maestro-4.0.x/Maestro/changelog.txt
   branches/maestro-4.0.x/MgCooker/BatchSettings.cs
   branches/maestro-4.0.x/MgCooker/Program.cs
Log:
Fix some MgCooker command line arguments being ignored

Modified: branches/maestro-4.0.x/Maestro/changelog.txt
===================================================================
--- branches/maestro-4.0.x/Maestro/changelog.txt	2012-05-17 14:22:19 UTC (rev 6659)
+++ branches/maestro-4.0.x/Maestro/changelog.txt	2012-05-17 15:31:21 UTC (rev 6660)
@@ -1,5 +1,11 @@
-4.0.1
+4.0.2
 -----
+ - Fix: Some MgCooker command line arguments were being ignored
+ - Fix: Raise signficantly the maximum allowed "Meters per unit" value in MgCooker.
+ - Fix: Dragging and dropping onto a layer in the Map Definition editor will add the layer to that layer's parent group instead of the root
+
+4.0.1
+-----
  - Uses new mg-desktop release (8 May 2012, .net 2.0, VC9)
  - New command to open sources by entering its resource id
  - New shortcut buttons to jump from Layer Definition to Feature/Drawing Source

Modified: branches/maestro-4.0.x/MgCooker/BatchSettings.cs
===================================================================
--- branches/maestro-4.0.x/MgCooker/BatchSettings.cs	2012-05-17 14:22:19 UTC (rev 6659)
+++ branches/maestro-4.0.x/MgCooker/BatchSettings.cs	2012-05-17 15:31:21 UTC (rev 6660)
@@ -260,6 +260,11 @@
             m_connection = connection;
             m_maps = new List<BatchMap>();
 
+            AddMapDefinitions(maps);
+        }
+
+        public void AddMapDefinitions(params string[] maps)
+        {
             if (maps == null || maps.Length == 0 || (maps.Length == 1 && maps[0].Trim().Length == 0))
             {
                 List<string> tmp = new List<string>();

Modified: branches/maestro-4.0.x/MgCooker/Program.cs
===================================================================
--- branches/maestro-4.0.x/MgCooker/Program.cs	2012-05-17 14:22:19 UTC (rev 6659)
+++ branches/maestro-4.0.x/MgCooker/Program.cs	2012-05-17 15:31:21 UTC (rev 6660)
@@ -209,7 +209,7 @@
             }
             
 
-            BatchSettings bx = new BatchSettings(connection, maps);
+            BatchSettings bx = new BatchSettings(connection);
             if (!string.IsNullOrEmpty(scaleindex))
             {
                 List<int> scales = new List<int>();
@@ -263,6 +263,8 @@
             if (opts.ContainsKey("threadcount") && int.TryParse(opts["threadcount"], out x) && x > 0)
                 bx.Config.ThreadCount = x;
 
+            bx.AddMapDefinitions(maps);
+
             if (overrideExtents != null)
                 foreach (BatchMap bm in bx.Maps)
                     bm.MaxExtent = overrideExtents;