[mapguide-commits] r7626 - in trunk/Tools/Maestro: Maestro.Editors Maestro.Editors/MapDefinition OSGeo.MapGuide.MaestroAPI/ObjectModels
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Jun 16 21:48:28 PDT 2013
Author: jng
Date: 2013-06-16 21:48:27 -0700 (Sun, 16 Jun 2013)
New Revision: 7626
Modified:
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx
trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/Strings.resx
trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
Log:
#2293: Support layer re-ordering within a group in the "Layers by Group" tab of the Map Definition editor. Because layers within a group are presented by draw order, re-ordering such layers within a group will be affecting the draw order.
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2013-06-15 11:49:13 UTC (rev 7625)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.Designer.cs 2013-06-17 04:48:27 UTC (rev 7626)
@@ -41,8 +41,8 @@
this.btnGRPAddLayer = new System.Windows.Forms.ToolStripButton();
this.btnGRPRemoveLayer = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
- this.btnMoveGroupUp = new System.Windows.Forms.ToolStripButton();
- this.btnMoveGroupDown = new System.Windows.Forms.ToolStripButton();
+ this.btnMoveLayerOrGroupUp = new System.Windows.Forms.ToolStripButton();
+ this.btnMoveLayerOrGroupDown = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.btnConvertLayerGroupToBaseGroup = new System.Windows.Forms.ToolStripButton();
this.TAB_DRAWING_ORDER = new System.Windows.Forms.TabPage();
@@ -155,8 +155,8 @@
this.btnGRPAddLayer,
this.btnGRPRemoveLayer,
this.toolStripSeparator3,
- this.btnMoveGroupUp,
- this.btnMoveGroupDown,
+ this.btnMoveLayerOrGroupUp,
+ this.btnMoveLayerOrGroupDown,
this.toolStripSeparator7,
this.btnConvertLayerGroupToBaseGroup});
resources.ApplyResources(this.toolStrip1, "toolStrip1");
@@ -204,21 +204,21 @@
this.toolStripSeparator3.Name = "toolStripSeparator3";
resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
//
- // btnMoveGroupUp
+ // btnMoveLayerOrGroupUp
//
- this.btnMoveGroupUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- resources.ApplyResources(this.btnMoveGroupUp, "btnMoveGroupUp");
- this.btnMoveGroupUp.Image = global::Maestro.Editors.Properties.Resources.arrow_090;
- this.btnMoveGroupUp.Name = "btnMoveGroupUp";
- this.btnMoveGroupUp.Click += new System.EventHandler(this.btnMoveGroupUp_Click);
+ this.btnMoveLayerOrGroupUp.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ resources.ApplyResources(this.btnMoveLayerOrGroupUp, "btnMoveLayerOrGroupUp");
+ this.btnMoveLayerOrGroupUp.Image = global::Maestro.Editors.Properties.Resources.arrow_090;
+ this.btnMoveLayerOrGroupUp.Name = "btnMoveLayerOrGroupUp";
+ this.btnMoveLayerOrGroupUp.Click += new System.EventHandler(this.btnMoveLayerOrGroupUp_Click);
//
- // btnMoveGroupDown
+ // btnMoveLayerOrGroupDown
//
- this.btnMoveGroupDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- resources.ApplyResources(this.btnMoveGroupDown, "btnMoveGroupDown");
- this.btnMoveGroupDown.Image = global::Maestro.Editors.Properties.Resources.arrow_270;
- this.btnMoveGroupDown.Name = "btnMoveGroupDown";
- this.btnMoveGroupDown.Click += new System.EventHandler(this.btnMoveGroupDown_Click);
+ this.btnMoveLayerOrGroupDown.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ resources.ApplyResources(this.btnMoveLayerOrGroupDown, "btnMoveLayerOrGroupDown");
+ this.btnMoveLayerOrGroupDown.Image = global::Maestro.Editors.Properties.Resources.arrow_270;
+ this.btnMoveLayerOrGroupDown.Name = "btnMoveLayerOrGroupDown";
+ this.btnMoveLayerOrGroupDown.Click += new System.EventHandler(this.btnMoveLayerOrGroupDown_Click);
//
// toolStripSeparator7
//
@@ -563,8 +563,8 @@
private Aga.Controls.Tree.TreeViewAdv trvBaseLayers;
private Aga.Controls.Tree.NodeControls.NodeIcon nodeIcon1;
private Aga.Controls.Tree.NodeControls.NodeTextBox nodeTextBox1;
- private System.Windows.Forms.ToolStripButton btnMoveGroupUp;
- private System.Windows.Forms.ToolStripButton btnMoveGroupDown;
+ private System.Windows.Forms.ToolStripButton btnMoveLayerOrGroupUp;
+ private System.Windows.Forms.ToolStripButton btnMoveLayerOrGroupDown;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripButton btnBaseLayerGroupToRegular;
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2013-06-15 11:49:13 UTC (rev 7625)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2013-06-17 04:48:27 UTC (rev 7626)
@@ -199,8 +199,8 @@
btnGRPRemoveLayer.Enabled = false;
btnRemoveGroup.Enabled = false;
- btnMoveGroupUp.Enabled = false;
- btnMoveGroupDown.Enabled = false;
+ btnMoveLayerOrGroupUp.Enabled = false;
+ btnMoveLayerOrGroupDown.Enabled = false;
btnConvertLayerGroupToBaseGroup.Enabled = false;
if (layer != null)
@@ -217,8 +217,8 @@
private void OnDynamicGroupItemSelected(GroupItem group)
{
btnRemoveGroup.Enabled = true;
- btnMoveGroupUp.Enabled = true;
- btnMoveGroupDown.Enabled = true;
+ btnMoveLayerOrGroupUp.Enabled = true;
+ btnMoveLayerOrGroupDown.Enabled = true;
btnConvertLayerGroupToBaseGroup.Enabled = true;
propertiesPanel.Controls.Clear();
@@ -232,6 +232,8 @@
private void OnDynamicLayerItemSelected(LayerItem layer)
{
btnGRPRemoveLayer.Enabled = true;
+ btnMoveLayerOrGroupUp.Enabled = true; //TODO: Disable if layer is top of its group
+ btnMoveLayerOrGroupDown.Enabled = true; //TODO: Disable if layer is bottom of its group
propertiesPanel.Controls.Clear();
var item = new LayerPropertiesCtrl(layer.Tag, _edSvc.ResourceService);
@@ -830,9 +832,53 @@
}
}
- private void btnMoveGroupUp_Click(object sender, EventArgs e)
+ /// <summary>
+ /// Gets the index of the layer above the current layer index of the same group
+ /// </summary>
+ /// <param name="mdf"></param>
+ /// <param name="layerIndex"></param>
+ /// <param name="group"></param>
+ /// <returns>The index of the layer below the current layer. Returns -1 if the current layer index is the top-most layer of the group</returns>
+ private static int GetIndexOfLayerAbove(IMapDefinition mdf, int layerIndex, string group)
{
- var group = GetSelectedLayerGroupItem() as GroupItem;
+ if (layerIndex > 0)
+ {
+ var list = new List<IMapLayer>(mdf.MapLayer);
+ for (int i = layerIndex - 1; i >= 0; i--)
+ {
+ if (list[i].Group == group)
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ /// <summary>
+ /// Gets the index of the layer below the current layer index of the same group
+ /// </summary>
+ /// <param name="mdf"></param>
+ /// <param name="layerIndex"></param>
+ /// <param name="group"></param>
+ /// <returns>The index of the layer below the current layer. Returns -1 if the current layer index is the bottom-most layer of the group</returns>
+ private static int GetIndexOfLayerBelow(IMapDefinition mdf, int layerIndex, string group)
+ {
+ if (layerIndex < mdf.GetLayerCount() - 1)
+ {
+ var list = new List<IMapLayer>(mdf.MapLayer);
+ for (int i = layerIndex + 1; i < mdf.GetLayerCount(); i++)
+ {
+ if (list[i].Group == group)
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ private void btnMoveLayerOrGroupUp_Click(object sender, EventArgs e)
+ {
+ object item = GetSelectedLayerGroupItem();
+ var group = item as GroupItem;
+ var layer = item as LayerItem;
if (group != null)
{
var mdf = group.Tag.Parent;
@@ -842,11 +888,33 @@
RestoreGroupSelection(group);
}
+ else if (layer != null)
+ {
+ var mdf = _map;
+ var oLayer = layer.Tag;
+ var layerIdx = mdf.GetIndex(oLayer);
+ var newIndex = GetIndexOfLayerAbove(mdf, layerIdx, oLayer.Group);
+ if (newIndex >= 0)
+ {
+ mdf.RemoveLayer(oLayer);
+ mdf.InsertLayer(newIndex, oLayer);
+
+ _grpLayerModel.Invalidate();
+ _doLayerModel.Invalidate(); //This affects draw order too
+ RestoreLayerSelection(oLayer);
+ }
+ else
+ {
+ MessageBox.Show(Strings.LayerAlreadyAtTopOfGroup);
+ }
+ }
}
- private void btnMoveGroupDown_Click(object sender, EventArgs e)
+ private void btnMoveLayerOrGroupDown_Click(object sender, EventArgs e)
{
- var group = GetSelectedLayerGroupItem() as GroupItem;
+ object item = GetSelectedLayerGroupItem();
+ var group = item as GroupItem;
+ var layer = item as LayerItem;
if (group != null)
{
var mdf = group.Tag.Parent;
@@ -856,6 +924,26 @@
RestoreGroupSelection(group);
}
+ else if (layer != null)
+ {
+ var mdf = _map;
+ var oLayer = layer.Tag;
+ var layerIdx = mdf.GetIndex(oLayer);
+ var newIndex = GetIndexOfLayerBelow(mdf, layerIdx, oLayer.Group);
+ if (newIndex >= 0)
+ {
+ mdf.RemoveLayer(oLayer);
+ mdf.InsertLayer(newIndex, oLayer);
+
+ _grpLayerModel.Invalidate();
+ _doLayerModel.Invalidate(); //This affects draw order too
+ RestoreLayerSelection(oLayer);
+ }
+ else
+ {
+ MessageBox.Show(Strings.LayerAlreadyAtBottomOfGroup);
+ }
+ }
}
private void btnMoveBaseLayerDown_Click(object sender, EventArgs e)
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx 2013-06-15 11:49:13 UTC (rev 7625)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.resx 2013-06-17 04:48:27 UTC (rev 7626)
@@ -243,28 +243,28 @@
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 25</value>
</data>
- <data name="btnMoveGroupUp.Enabled" type="System.Boolean, mscorlib">
+ <data name="btnMoveLayerOrGroupUp.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
- <data name="btnMoveGroupUp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnMoveLayerOrGroupUp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="btnMoveGroupUp.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="btnMoveLayerOrGroupUp.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
- <data name="btnMoveGroupUp.Text" xml:space="preserve">
+ <data name="btnMoveLayerOrGroupUp.Text" xml:space="preserve">
<value>Move the selected group up the logical order</value>
</data>
- <data name="btnMoveGroupDown.Enabled" type="System.Boolean, mscorlib">
+ <data name="btnMoveLayerOrGroupDown.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
- <data name="btnMoveGroupDown.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+ <data name="btnMoveLayerOrGroupDown.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
- <data name="btnMoveGroupDown.Size" type="System.Drawing.Size, System.Drawing">
+ <data name="btnMoveLayerOrGroupDown.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
- <data name="btnMoveGroupDown.Text" xml:space="preserve">
+ <data name="btnMoveLayerOrGroupDown.Text" xml:space="preserve">
<value>Move the selected group down the logical order</value>
</data>
<data name="toolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
@@ -612,18 +612,18 @@
<data name="btnInvokeMgCooker.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- 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
+ 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
</value>
</data>
<data name="btnInvokeMgCooker.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
@@ -782,16 +782,16 @@
<data name=">>toolStripSeparator3.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>btnMoveGroupUp.Name" xml:space="preserve">
- <value>btnMoveGroupUp</value>
+ <data name=">>btnMoveLayerOrGroupUp.Name" xml:space="preserve">
+ <value>btnMoveLayerOrGroupUp</value>
</data>
- <data name=">>btnMoveGroupUp.Type" xml:space="preserve">
+ <data name=">>btnMoveLayerOrGroupUp.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>btnMoveGroupDown.Name" xml:space="preserve">
- <value>btnMoveGroupDown</value>
+ <data name=">>btnMoveLayerOrGroupDown.Name" xml:space="preserve">
+ <value>btnMoveLayerOrGroupDown</value>
</data>
- <data name=">>btnMoveGroupDown.Type" xml:space="preserve">
+ <data name=">>btnMoveLayerOrGroupDown.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>toolStripSeparator7.Name" xml:space="preserve">
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2013-06-15 11:49:13 UTC (rev 7625)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.Designer.cs 2013-06-17 04:48:27 UTC (rev 7626)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18047
+// Runtime Version:4.0.30319.18034
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -1418,6 +1418,24 @@
}
/// <summary>
+ /// Looks up a localized string similar to The selected layer is already at the bottom of its group.
+ /// </summary>
+ internal static string LayerAlreadyAtBottomOfGroup {
+ get {
+ return ResourceManager.GetString("LayerAlreadyAtBottomOfGroup", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The selected layer is already at the top of its group.
+ /// </summary>
+ internal static string LayerAlreadyAtTopOfGroup {
+ get {
+ return ResourceManager.GetString("LayerAlreadyAtTopOfGroup", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Layer Group ({0}) successfully converted to Base Layer Group ({1}).
/// </summary>
internal static string LayerGroupConvertedToBaseLayerGroup {
Modified: trunk/Tools/Maestro/Maestro.Editors/Strings.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2013-06-15 11:49:13 UTC (rev 7625)
+++ trunk/Tools/Maestro/Maestro.Editors/Strings.resx 2013-06-17 04:48:27 UTC (rev 7626)
@@ -1512,4 +1512,10 @@
<data name="NoFeatureClassAssigned" xml:space="preserve">
<value>No Feature Class assigned</value>
</data>
+ <data name="LayerAlreadyAtBottomOfGroup" xml:space="preserve">
+ <value>The selected layer is already at the bottom of its group</value>
+ </data>
+ <data name="LayerAlreadyAtTopOfGroup" xml:space="preserve">
+ <value>The selected layer is already at the top of its group</value>
+ </data>
</root>
\ No newline at end of file
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs 2013-06-15 11:49:13 UTC (rev 7625)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/MapDefinition.cs 2013-06-17 04:48:27 UTC (rev 7626)
@@ -218,7 +218,7 @@
/// <param name="layer"></param>
void IMapDefinition.InsertLayer(int idx, IMapLayer layer)
{
- Check.IntBetween(idx, 0, this.MapLayer.Count, true, "idx"); //NOXLATE
+ Check.IntBetween(idx, 0, this.MapLayer.Count, true, "idx (" + idx + ") between [" + 0 + "," + this.MapLayer.Count + "]"); //NOXLATE
Check.NotNull(layer, "layer"); //NOXLATE
var li = layer as MapLayerType;
if (li != null)
@@ -344,7 +344,7 @@
public IMapLayer InsertLayer(int index, string groupName, string layerName, string layerDefinitionId)
{
- Check.IntBetween(index, 0, this.MapLayer.Count, true, "index");
+ Check.IntBetween(index, 0, this.MapLayer.Count, true, "index (" + index + ") between [" + 0 + "," + this.MapLayer.Count + "]");
Check.NotEmpty(layerName, "layerName"); //NOXLATE
Check.NotEmpty(layerDefinitionId, "layerDefinitionId"); //NOXLATE
Check.Precondition(ResourceIdentifier.Validate(layerDefinitionId), "ResourceIdentifier.Validate(layerDefinitionId)"); //NOXLATE
More information about the mapguide-commits
mailing list