[mapguide-commits] r8699 - in trunk/Tools/Maestro: Maestro.Editors/FeatureSource/Providers Maestro.Editors/MapDefinition OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jul 9 04:53:55 PDT 2015
Author: jng
Date: 2015-07-09 04:53:55 -0700 (Thu, 09 Jul 2015)
New Revision: 8699
Modified:
trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.Designer.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs
trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.resx
trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
Log:
Fix the following issues:
- #2564: Feature Source XML does not properly update when switching to unmanaged mode
- Check and apply alias when switching to unmanaged mode
- #2563: Cannot make v3.0.0 untiled Map Definitions
- Expose a radio button for the TileSetSource.None option. Default to this setting when creating a new v3.0.0 Map Definition
Modified: trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2015-07-09 08:59:56 UTC (rev 8698)
+++ trunk/Tools/Maestro/Maestro.Editors/FeatureSource/Providers/FileBasedCtrl.cs 2015-07-09 11:53:55 UTC (rev 8699)
@@ -46,6 +46,9 @@
{
unmanagedPanel.Enabled = true;
resDataCtrl.Enabled = false;
+
+ if (!string.IsNullOrEmpty(txtAlias.Text))
+ ApplyAliasToFeatureSource();
}
private IEditorService _service;
@@ -104,6 +107,11 @@
private void txtAlias_TextChanged(object sender, EventArgs e)
{
+ ApplyAliasToFeatureSource();
+ }
+
+ private void ApplyAliasToFeatureSource()
+ {
if (rdUnmanaged.Checked)
{
var fs = (IFeatureSource)_service.GetEditedResource();
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2015-07-09 08:59:56 UTC (rev 8698)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapLayersSectionCtrl.cs 2015-07-09 11:53:55 UTC (rev 8699)
@@ -245,9 +245,12 @@
private void RefreshModels()
{
- _doLayerModel.Invalidate();
- _grpLayerModel.Invalidate();
- _tiledLayerModel.Invalidate();
+ if (_doLayerModel != null)
+ _doLayerModel.Invalidate();
+ if (_grpLayerModel != null)
+ _grpLayerModel.Invalidate();
+ if (_tiledLayerModel != null)
+ _tiledLayerModel.Invalidate();
}
public event OpenLayerEventHandler RequestLayerOpen;
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.Designer.cs 2015-07-09 08:59:56 UTC (rev 8698)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.Designer.cs 2015-07-09 11:53:55 UTC (rev 8699)
@@ -52,6 +52,7 @@
this.rdExternal = new System.Windows.Forms.RadioButton();
this.rdInline = new System.Windows.Forms.RadioButton();
this.label10 = new System.Windows.Forms.Label();
+ this.rdNone = new System.Windows.Forms.RadioButton();
this.contentPanel.SuspendLayout();
this.groupBox2.SuspendLayout();
this.pnlTileSource.SuspendLayout();
@@ -191,6 +192,7 @@
//
// pnlTileSource
//
+ this.pnlTileSource.Controls.Add(this.rdNone);
this.pnlTileSource.Controls.Add(this.rdExternal);
this.pnlTileSource.Controls.Add(this.rdInline);
this.pnlTileSource.Controls.Add(this.label10);
@@ -207,9 +209,7 @@
// rdInline
//
resources.ApplyResources(this.rdInline, "rdInline");
- this.rdInline.Checked = true;
this.rdInline.Name = "rdInline";
- this.rdInline.TabStop = true;
this.rdInline.UseVisualStyleBackColor = true;
this.rdInline.CheckedChanged += new System.EventHandler(this.rdInline_CheckedChanged);
//
@@ -218,6 +218,15 @@
resources.ApplyResources(this.label10, "label10");
this.label10.Name = "label10";
//
+ // rdNone
+ //
+ resources.ApplyResources(this.rdNone, "rdNone");
+ this.rdNone.Checked = true;
+ this.rdNone.Name = "rdNone";
+ this.rdNone.TabStop = true;
+ this.rdNone.UseVisualStyleBackColor = true;
+ this.rdNone.CheckedChanged += new System.EventHandler(this.rdNone_CheckedChanged);
+ //
// MapSettingsSectionCtrl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -258,5 +267,6 @@
private System.Windows.Forms.RadioButton rdExternal;
private System.Windows.Forms.RadioButton rdInline;
private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.RadioButton rdNone;
}
}
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs 2015-07-09 08:59:56 UTC (rev 8698)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.cs 2015-07-09 11:53:55 UTC (rev 8699)
@@ -73,8 +73,8 @@
case TileSourceType.Inline:
rdInline.Checked = true;
break;
- default: //Default to external
- rdExternal.Checked = true;
+ default: //Default to none
+ rdNone.Checked = true;
break;
}
}
@@ -285,28 +285,33 @@
}
}
- private void rdInline_CheckedChanged(object sender, EventArgs e)
+ private void UpdateTileSourceType()
{
var mdf3 = _map as IMapDefinition3;
if (mdf3 != null)
{
- if (rdInline.Checked)
+ if (rdExternal.Checked)
+ mdf3.TileSourceType = TileSourceType.External;
+ else if (rdInline.Checked)
mdf3.TileSourceType = TileSourceType.Inline;
else
- mdf3.TileSourceType = TileSourceType.External;
+ mdf3.TileSourceType = TileSourceType.None;
}
}
+ private void rdInline_CheckedChanged(object sender, EventArgs e)
+ {
+ UpdateTileSourceType();
+ }
+
private void rdExternal_CheckedChanged(object sender, EventArgs e)
{
- var mdf3 = _map as IMapDefinition3;
- if (mdf3 != null)
- {
- if (rdExternal.Checked)
- mdf3.TileSourceType = TileSourceType.External;
- else
- mdf3.TileSourceType = TileSourceType.Inline;
- }
+ UpdateTileSourceType();
}
+
+ private void rdNone_CheckedChanged(object sender, EventArgs e)
+ {
+ UpdateTileSourceType();
+ }
}
}
\ No newline at end of file
Modified: trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.resx 2015-07-09 08:59:56 UTC (rev 8698)
+++ trunk/Tools/Maestro/Maestro.Editors/MapDefinition/MapSettingsSectionCtrl.resx 2015-07-09 11:53:55 UTC (rev 8699)
@@ -118,19 +118,49 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="rdExternal.AutoSize" type="System.Boolean, mscorlib">
+ <data name="rdNone.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="rdExternal.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="rdNone.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="rdNone.Location" type="System.Drawing.Point, System.Drawing">
+ <value>152, 6</value>
+ </data>
+ <data name="rdNone.Size" type="System.Drawing.Size, System.Drawing">
+ <value>63, 21</value>
+ </data>
+ <data name="rdNone.TabIndex" type="System.Int32, mscorlib">
+ <value>3</value>
+ </data>
+ <data name="rdNone.Text" xml:space="preserve">
+ <value>None</value>
+ </data>
+ <data name=">>rdNone.Name" xml:space="preserve">
+ <value>rdNone</value>
+ </data>
+ <data name=">>rdNone.Type" xml:space="preserve">
+ <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>rdNone.Parent" xml:space="preserve">
+ <value>pnlTileSource</value>
+ </data>
+ <data name=">>rdNone.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
+ <data name="rdExternal.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="rdExternal.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <value>NoControl</value>
+ </data>
<data name="rdExternal.Location" type="System.Drawing.Point, System.Drawing">
- <value>201, 6</value>
+ <value>279, 6</value>
</data>
<data name="rdExternal.Size" type="System.Drawing.Size, System.Drawing">
- <value>63, 17</value>
+ <value>80, 21</value>
</data>
<data name="rdExternal.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@@ -148,16 +178,16 @@
<value>pnlTileSource</value>
</data>
<data name=">>rdExternal.ZOrder" xml:space="preserve">
- <value>0</value>
+ <value>1</value>
</data>
<data name="rdInline.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="rdInline.Location" type="System.Drawing.Point, System.Drawing">
- <value>143, 6</value>
+ <value>221, 6</value>
</data>
<data name="rdInline.Size" type="System.Drawing.Size, System.Drawing">
- <value>50, 17</value>
+ <value>62, 21</value>
</data>
<data name="rdInline.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@@ -175,7 +205,7 @@
<value>pnlTileSource</value>
</data>
<data name=">>rdInline.ZOrder" xml:space="preserve">
- <value>1</value>
+ <value>2</value>
</data>
<data name="label10.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@@ -184,7 +214,7 @@
<value>18, 8</value>
</data>
<data name="label10.Size" type="System.Drawing.Size, System.Drawing">
- <value>61, 13</value>
+ <value>80, 17</value>
</data>
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -202,7 +232,7 @@
<value>pnlTileSource</value>
</data>
<data name=">>label10.ZOrder" xml:space="preserve">
- <value>2</value>
+ <value>3</value>
</data>
<data name="pnlTileSource.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Bottom</value>
@@ -232,7 +262,7 @@
<value>143, 58</value>
</data>
<data name="cmbBackgroundColor.Size" type="System.Drawing.Size, System.Drawing">
- <value>121, 21</value>
+ <value>121, 23</value>
</data>
<data name="cmbBackgroundColor.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -283,7 +313,7 @@
<value>143, 32</value>
</data>
<data name="txtCoordinateSystem.Size" type="System.Drawing.Size, System.Drawing">
- <value>371, 20</value>
+ <value>371, 22</value>
</data>
<data name="txtCoordinateSystem.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@@ -307,7 +337,7 @@
<value>143, 6</value>
</data>
<data name="txtDescription.Size" type="System.Drawing.Size, System.Drawing">
- <value>405, 20</value>
+ <value>405, 22</value>
</data>
<data name="txtDescription.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -327,258 +357,6 @@
<data name="groupBox2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
- <data name=">>btnSetZoom.Name" xml:space="preserve">
- <value>btnSetZoom</value>
- </data>
- <data name=">>btnSetZoom.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>btnSetZoom.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>btnSetZoom.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
- <data name=">>txtUpperY.Name" xml:space="preserve">
- <value>txtUpperY</value>
- </data>
- <data name=">>txtUpperY.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtUpperY.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>txtUpperY.ZOrder" xml:space="preserve">
- <value>1</value>
- </data>
- <data name=">>label8.Name" xml:space="preserve">
- <value>label8</value>
- </data>
- <data name=">>label8.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label8.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label8.ZOrder" xml:space="preserve">
- <value>2</value>
- </data>
- <data name=">>txtUpperX.Name" xml:space="preserve">
- <value>txtUpperX</value>
- </data>
- <data name=">>txtUpperX.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtUpperX.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>txtUpperX.ZOrder" xml:space="preserve">
- <value>3</value>
- </data>
- <data name=">>label7.Name" xml:space="preserve">
- <value>label7</value>
- </data>
- <data name=">>label7.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label7.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label7.ZOrder" xml:space="preserve">
- <value>4</value>
- </data>
- <data name=">>txtLowerY.Name" xml:space="preserve">
- <value>txtLowerY</value>
- </data>
- <data name=">>txtLowerY.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtLowerY.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>txtLowerY.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
- <data name=">>label6.Name" xml:space="preserve">
- <value>label6</value>
- </data>
- <data name=">>label6.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label6.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label6.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name=">>txtLowerX.Name" xml:space="preserve">
- <value>txtLowerX</value>
- </data>
- <data name=">>txtLowerX.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>txtLowerX.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>txtLowerX.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name=">>label5.Name" xml:space="preserve">
- <value>label5</value>
- </data>
- <data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label5.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label5.ZOrder" xml:space="preserve">
- <value>8</value>
- </data>
- <data name=">>label4.Name" xml:space="preserve">
- <value>label4</value>
- </data>
- <data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label4.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label4.ZOrder" xml:space="preserve">
- <value>9</value>
- </data>
- <data name=">>label9.Name" xml:space="preserve">
- <value>label9</value>
- </data>
- <data name=">>label9.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label9.Parent" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>label9.ZOrder" xml:space="preserve">
- <value>10</value>
- </data>
- <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
- <value>20, 85</value>
- </data>
- <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
- <value>528, 80</value>
- </data>
- <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
- <value>4</value>
- </data>
- <data name="groupBox2.Text" xml:space="preserve">
- <value>Initial map view</value>
- </data>
- <data name=">>groupBox2.Name" xml:space="preserve">
- <value>groupBox2</value>
- </data>
- <data name=">>groupBox2.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>groupBox2.Parent" xml:space="preserve">
- <value>contentPanel</value>
- </data>
- <data name=">>groupBox2.ZOrder" xml:space="preserve">
- <value>5</value>
- </data>
- <data name="label3.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
- <value>17, 61</value>
- </data>
- <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
- <value>92, 13</value>
- </data>
- <data name="label3.TabIndex" type="System.Int32, mscorlib">
- <value>2</value>
- </data>
- <data name="label3.Text" xml:space="preserve">
- <value>Background Color</value>
- </data>
- <data name=">>label3.Name" xml:space="preserve">
- <value>label3</value>
- </data>
- <data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label3.Parent" xml:space="preserve">
- <value>contentPanel</value>
- </data>
- <data name=">>label3.ZOrder" xml:space="preserve">
- <value>6</value>
- </data>
- <data name="label2.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
- <value>17, 35</value>
- </data>
- <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
- <value>95, 13</value>
- </data>
- <data name="label2.TabIndex" type="System.Int32, mscorlib">
- <value>1</value>
- </data>
- <data name="label2.Text" xml:space="preserve">
- <value>Coordinate System</value>
- </data>
- <data name=">>label2.Name" xml:space="preserve">
- <value>label2</value>
- </data>
- <data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label2.Parent" xml:space="preserve">
- <value>contentPanel</value>
- </data>
- <data name=">>label2.ZOrder" xml:space="preserve">
- <value>7</value>
- </data>
- <data name="label1.AutoSize" type="System.Boolean, mscorlib">
- <value>True</value>
- </data>
- <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
- <value>17, 9</value>
- </data>
- <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
- <value>60, 13</value>
- </data>
- <data name="label1.TabIndex" type="System.Int32, mscorlib">
- <value>0</value>
- </data>
- <data name="label1.Text" xml:space="preserve">
- <value>Description</value>
- </data>
- <data name=">>label1.Name" xml:space="preserve">
- <value>label1</value>
- </data>
- <data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>label1.Parent" xml:space="preserve">
- <value>contentPanel</value>
- </data>
- <data name=">>label1.ZOrder" xml:space="preserve">
- <value>8</value>
- </data>
- <data name="contentPanel.Size" type="System.Drawing.Size, System.Drawing">
- <value>561, 201</value>
- </data>
- <data name=">>contentPanel.Name" xml:space="preserve">
- <value>contentPanel</value>
- </data>
- <data name=">>contentPanel.Type" xml:space="preserve">
- <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </data>
- <data name=">>contentPanel.Parent" xml:space="preserve">
- <value>$this</value>
- </data>
- <data name=">>contentPanel.ZOrder" xml:space="preserve">
- <value>0</value>
- </data>
<data name="btnSetZoom.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@@ -610,7 +388,7 @@
<value>280, 50</value>
</data>
<data name="txtUpperY.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 20</value>
+ <value>96, 22</value>
</data>
<data name="txtUpperY.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
@@ -658,7 +436,7 @@
<value>144, 50</value>
</data>
<data name="txtUpperX.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 20</value>
+ <value>96, 22</value>
</data>
<data name="txtUpperX.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@@ -706,7 +484,7 @@
<value>280, 24</value>
</data>
<data name="txtLowerY.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 20</value>
+ <value>96, 22</value>
</data>
<data name="txtLowerY.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@@ -754,7 +532,7 @@
<value>144, 24</value>
</data>
<data name="txtLowerX.Size" type="System.Drawing.Size, System.Drawing">
- <value>96, 20</value>
+ <value>96, 22</value>
</data>
<data name="txtLowerX.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
@@ -852,6 +630,126 @@
<data name=">>label9.ZOrder" xml:space="preserve">
<value>10</value>
</data>
+ <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>20, 85</value>
+ </data>
+ <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>528, 80</value>
+ </data>
+ <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+ <value>4</value>
+ </data>
+ <data name="groupBox2.Text" xml:space="preserve">
+ <value>Initial map view</value>
+ </data>
+ <data name=">>groupBox2.Name" xml:space="preserve">
+ <value>groupBox2</value>
+ </data>
+ <data name=">>groupBox2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>groupBox2.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>groupBox2.ZOrder" xml:space="preserve">
+ <value>5</value>
+ </data>
+ <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 61</value>
+ </data>
+ <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+ <value>121, 17</value>
+ </data>
+ <data name="label3.TabIndex" type="System.Int32, mscorlib">
+ <value>2</value>
+ </data>
+ <data name="label3.Text" xml:space="preserve">
+ <value>Background Color</value>
+ </data>
+ <data name=">>label3.Name" xml:space="preserve">
+ <value>label3</value>
+ </data>
+ <data name=">>label3.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label3.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>label3.ZOrder" xml:space="preserve">
+ <value>6</value>
+ </data>
+ <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 35</value>
+ </data>
+ <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+ <value>127, 17</value>
+ </data>
+ <data name="label2.TabIndex" type="System.Int32, mscorlib">
+ <value>1</value>
+ </data>
+ <data name="label2.Text" xml:space="preserve">
+ <value>Coordinate System</value>
+ </data>
+ <data name=">>label2.Name" xml:space="preserve">
+ <value>label2</value>
+ </data>
+ <data name=">>label2.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label2.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>label2.ZOrder" xml:space="preserve">
+ <value>7</value>
+ </data>
+ <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+ <value>True</value>
+ </data>
+ <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+ <value>17, 9</value>
+ </data>
+ <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+ <value>79, 17</value>
+ </data>
+ <data name="label1.TabIndex" type="System.Int32, mscorlib">
+ <value>0</value>
+ </data>
+ <data name="label1.Text" xml:space="preserve">
+ <value>Description</value>
+ </data>
+ <data name=">>label1.Name" xml:space="preserve">
+ <value>label1</value>
+ </data>
+ <data name=">>label1.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>label1.Parent" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>label1.ZOrder" xml:space="preserve">
+ <value>8</value>
+ </data>
+ <data name="contentPanel.Size" type="System.Drawing.Size, System.Drawing">
+ <value>561, 201</value>
+ </data>
+ <data name=">>contentPanel.Name" xml:space="preserve">
+ <value>contentPanel</value>
+ </data>
+ <data name=">>contentPanel.Type" xml:space="preserve">
+ <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name=">>contentPanel.Parent" xml:space="preserve">
+ <value>$this</value>
+ </data>
+ <data name=">>contentPanel.ZOrder" xml:space="preserve">
+ <value>0</value>
+ </data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Modified: trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-07-09 08:59:56 UTC (rev 8698)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.ObjectModels/MapDefinition/v3_0_0/MapDefinitionImpl.cs 2015-07-09 11:53:55 UTC (rev 8699)
@@ -76,7 +76,7 @@
{
internal static MapDefinition CreateDefault()
{
- return new MapDefinition()
+ var mdf3 = new MapDefinition()
{
Name = string.Empty,
CoordinateSystem = string.Empty,
@@ -84,8 +84,10 @@
BackgroundColor = Color.White,
MapLayer = new System.ComponentModel.BindingList<MapLayerType>(),
MapLayerGroup = new System.ComponentModel.BindingList<MapLayerGroupType>(),
- Watermarks = new BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0.WatermarkType>()
+ Watermarks = new BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.v2_4_0.WatermarkType>()
};
+ ((IMapDefinition3)mdf3).TileSourceType = TileSourceType.None;
+ return mdf3;
}
public static IResource Deserialize(string xml)
More information about the mapguide-commits
mailing list