[mapguide-commits] r4464 - in trunk/Tools/Maestro: Maestro Maestro/MaestroEditorInterface Maestro/ResourceEditors MgCooker

[svn_mapguide at osgeo.org]

Author: ksgeograf
Date: 2009-12-23 14:52:00 -0500 (Wed, 23 Dec 2009)
New Revision: 4464

Modified:
   trunk/Tools/Maestro/Maestro/EditorInterface.cs
   trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs
   trunk/Tools/Maestro/Maestro/ResourceEditors/MapEditor.cs
   trunk/Tools/Maestro/MgCooker/BatchSettings.cs
   trunk/Tools/Maestro/MgCooker/Program.cs
Log:
Maestro:
Fixed issue #1103, bug in MgCooker

Modified: trunk/Tools/Maestro/Maestro/EditorInterface.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/EditorInterface.cs	2009-12-23 19:20:37 UTC (rev 4463)
+++ trunk/Tools/Maestro/Maestro/EditorInterface.cs	2009-12-23 19:52:00 UTC (rev 4464)
@@ -385,6 +385,8 @@
 
         public bool IsModified { get { return m_page.Text.EndsWith(" *"); } }
 
+        public string ResourceId { get { return m_resourceID; } }
+
 		#endregion
 	}
 }

Modified: trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs	2009-12-23 19:20:37 UTC (rev 4463)
+++ trunk/Tools/Maestro/Maestro/MaestroEditorInterface/EditorInterface.cs	2009-12-23 19:52:00 UTC (rev 4464)
@@ -165,5 +165,11 @@
         /// <param name="ex">The exception to register</param>
         void SetLastException(Exception ex);
 
+        /// <summary>
+        /// Returns the actual resourceId for the item.
+        /// Can only be used if Existing is true
+        /// </summary>
+        string ResourceId { get; }
+
 	}
 }

Modified: trunk/Tools/Maestro/Maestro/ResourceEditors/MapEditor.cs
===================================================================
--- trunk/Tools/Maestro/Maestro/ResourceEditors/MapEditor.cs	2009-12-23 19:20:37 UTC (rev 4463)
+++ trunk/Tools/Maestro/Maestro/ResourceEditors/MapEditor.cs	2009-12-23 19:52:00 UTC (rev 4464)
@@ -2233,7 +2233,7 @@
                 MaestroAPI.HttpServerConnection con = m_editor.CurrentConnection as MaestroAPI.HttpServerConnection;
                 args.Add("mapagent", con.ServerURI);
 
-                MgCooker.SetupRun dlg = new OSGeo.MapGuide.MgCooker.SetupRun(m_editor.CurrentConnection, new string[] { m_map.ResourceId }, args);
+                MgCooker.SetupRun dlg = new OSGeo.MapGuide.MgCooker.SetupRun(m_editor.CurrentConnection, new string[] { m_editor.ResourceId }, args);
                 dlg.ShowDialog(this);
             }
             catch(Exception ex)

Modified: trunk/Tools/Maestro/MgCooker/BatchSettings.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/BatchSettings.cs	2009-12-23 19:20:37 UTC (rev 4463)
+++ trunk/Tools/Maestro/MgCooker/BatchSettings.cs	2009-12-23 19:52:00 UTC (rev 4464)
@@ -397,6 +397,9 @@
         /// </summary>
         public int ColTileOffset { get { return m_colTileOffset; } }
 
+        //The map's scales may have been modified, this array is a map of the new values
+        public int[] ScaleIndexMap { get { return m_scaleindexmap; } }
+
         /// <summary>
         /// Constructs a new map to be processed
         /// </summary>

Modified: trunk/Tools/Maestro/MgCooker/Program.cs
===================================================================
--- trunk/Tools/Maestro/MgCooker/Program.cs	2009-12-23 19:20:37 UTC (rev 4463)
+++ trunk/Tools/Maestro/MgCooker/Program.cs	2009-12-23 19:52:00 UTC (rev 4464)
@@ -290,7 +290,7 @@
             Console.WriteLine(string.Format(Strings.Program.ConsoleUpdateTime.Replace("\\t", "\t"), DateTime.Now));
             Console.WriteLine(string.Format(Strings.Program.ConsoleCurrentMap.Replace("\\t", "\t"), map.ResourceId, mapCount, map.Parent.Maps.Count));
             Console.WriteLine(string.Format(Strings.Program.ConsoleCurrentGroup.Replace("\\t", "\t"), group, groupCount, map.Map.BaseMapDefinition.BaseMapLayerGroup.Count));
-            Console.WriteLine(string.Format(Strings.Program.ConsoleCurrentScale.Replace("\\t", "\t"), map.Map.BaseMapDefinition.FiniteDisplayScale[scaleindex], scaleindex, map.Map.BaseMapDefinition.FiniteDisplayScale.Count));
+            Console.WriteLine(string.Format(Strings.Program.ConsoleCurrentScale.Replace("\\t", "\t"), map.Map.BaseMapDefinition.FiniteDisplayScale[Array.IndexOf<int>(map.ScaleIndexMap, scaleindex)], Array.IndexOf<int>(map.ScaleIndexMap, scaleindex) + 1, map.Map.BaseMapDefinition.FiniteDisplayScale.Count));
             Console.WriteLine(string.Format(Strings.Program.ConsoleCurrentTile.Replace("\\t", "\t"), tileCount, totalTiles));
             Console.WriteLine();
             Console.WriteLine(string.Format(Strings.Program.ConsoleGroupDuration.Replace("\\t", "\t"), DateTime.Now - beginGroup));