[mapguide-commits] r6925 - in branches/maestro-4.0.x: . Maestro.Editors/Fusion Maestro.Editors/LayerDefinition/Vector/Thematics
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 31 06:16:37 PDT 2012
Author: jng
Date: 2012-07-31 06:16:36 -0700 (Tue, 31 Jul 2012)
New Revision: 6925
Modified:
branches/maestro-4.0.x/
branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.Designer.cs
branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs
branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.resx
branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
Log:
#2087, #2088: Backport fixes to 4.0.x
Property changes on: branches/maestro-4.0.x
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/Tools/Maestro:6490-6494
+ /trunk/Tools/Maestro:6490-6494,6923-6924
Modified: branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.Designer.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.Designer.cs 2012-07-31 13:02:20 UTC (rev 6924)
+++ branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.Designer.cs 2012-07-31 13:16:36 UTC (rev 6925)
@@ -50,7 +50,7 @@
this.grpCms = new System.Windows.Forms.GroupBox();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.chkOsmMapnik = new System.Windows.Forms.CheckBox();
- this.chkOsmOsmarender = new System.Windows.Forms.CheckBox();
+ this.chkOsmTransportMap = new System.Windows.Forms.CheckBox();
this.chkOsmCycleMap = new System.Windows.Forms.CheckBox();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.chkGoogTerrain = new System.Windows.Forms.CheckBox();
@@ -209,7 +209,7 @@
// groupBox6
//
this.groupBox6.Controls.Add(this.chkOsmMapnik);
- this.groupBox6.Controls.Add(this.chkOsmOsmarender);
+ this.groupBox6.Controls.Add(this.chkOsmTransportMap);
this.groupBox6.Controls.Add(this.chkOsmCycleMap);
resources.ApplyResources(this.groupBox6, "groupBox6");
this.groupBox6.Name = "groupBox6";
@@ -222,12 +222,12 @@
this.chkOsmMapnik.UseVisualStyleBackColor = true;
this.chkOsmMapnik.CheckedChanged += new System.EventHandler(this.chkOsmMapnik_CheckedChanged);
//
- // chkOsmOsmarender
+ // chkOsmTransportMap
//
- resources.ApplyResources(this.chkOsmOsmarender, "chkOsmOsmarender");
- this.chkOsmOsmarender.Name = "chkOsmOsmarender";
- this.chkOsmOsmarender.UseVisualStyleBackColor = true;
- this.chkOsmOsmarender.CheckedChanged += new System.EventHandler(this.chkOsmOsmarender_CheckedChanged);
+ resources.ApplyResources(this.chkOsmTransportMap, "chkOsmTransportMap");
+ this.chkOsmTransportMap.Name = "chkOsmTransportMap";
+ this.chkOsmTransportMap.UseVisualStyleBackColor = true;
+ this.chkOsmTransportMap.CheckedChanged += new System.EventHandler(this.chkOsmTransportMap_CheckedChanged);
//
// chkOsmCycleMap
//
@@ -408,7 +408,7 @@
private System.Windows.Forms.CheckBox chkGoogTerrain;
private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.CheckBox chkOsmMapnik;
- private System.Windows.Forms.CheckBox chkOsmOsmarender;
+ private System.Windows.Forms.CheckBox chkOsmTransportMap;
private System.Windows.Forms.CheckBox chkOsmCycleMap;
}
}
Modified: branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs 2012-07-31 13:02:20 UTC (rev 6924)
+++ branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.cs 2012-07-31 13:16:36 UTC (rev 6925)
@@ -57,7 +57,7 @@
const string Type_OSM = "OpenStreetMap";
const string OSM_MAP_MAPNIK = "Mapnik";
- const string OSM_MAP_OSMARENDER = "Osmarender";
+ const string OSM_MAP_TRANSPORTMAP = "TransportMap";
const string OSM_MAP_CYCLEMAP = "CycleMap";
private MapCtrl()
@@ -348,8 +348,8 @@
_cmsMaps[BING_HYBRID] = new CmsMap(group.CreateCmsMapEntry(Type_Bing, true, "Bing Maps Hybrid", BING_HYBRID)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(OSM_MAP_MAPNIK))
_cmsMaps[OSM_MAP_MAPNIK] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map", OSM_MAP_MAPNIK)) { IsEnabled = false };
- if (!_cmsMaps.ContainsKey(OSM_MAP_OSMARENDER))
- _cmsMaps[OSM_MAP_OSMARENDER] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (Osmarender)", OSM_MAP_OSMARENDER)) { IsEnabled = false };
+ if (!_cmsMaps.ContainsKey(OSM_MAP_TRANSPORTMAP))
+ _cmsMaps[OSM_MAP_TRANSPORTMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (TransportMap)", OSM_MAP_TRANSPORTMAP)) { IsEnabled = false };
if (!_cmsMaps.ContainsKey(OSM_MAP_CYCLEMAP))
_cmsMaps[OSM_MAP_CYCLEMAP] = new CmsMap(group.CreateCmsMapEntry(Type_OSM, true, "Open Street Map (CycleMap)", OSM_MAP_CYCLEMAP)) { IsEnabled = false };
}
@@ -533,15 +533,19 @@
if (_noEvents)
return;
+ if (chkOsmMapnik.Checked)
+ _appDef.SetValue("OpenStreetMapScript", OSM_URL);
SetCmsAvailability(OSM_MAP_MAPNIK, chkOsmMapnik.Checked);
}
- private void chkOsmOsmarender_CheckedChanged(object sender, EventArgs e)
+ private void chkOsmTransportMap_CheckedChanged(object sender, EventArgs e)
{
if (_noEvents)
return;
- SetCmsAvailability(OSM_MAP_OSMARENDER, chkOsmOsmarender.Checked);
+ if (chkOsmTransportMap.Checked)
+ _appDef.SetValue("OpenStreetMapScript", OSM_URL);
+ SetCmsAvailability(OSM_MAP_TRANSPORTMAP, chkOsmTransportMap.Checked);
}
private void chkOsmCycleMap_CheckedChanged(object sender, EventArgs e)
@@ -549,6 +553,8 @@
if (_noEvents)
return;
+ if (chkOsmCycleMap.Checked)
+ _appDef.SetValue("OpenStreetMapScript", OSM_URL);
SetCmsAvailability(OSM_MAP_CYCLEMAP, chkOsmCycleMap.Checked);
}
@@ -580,6 +586,7 @@
_appDef.SetValue("YahooScript", YAHOO_URL + txtYahooApiKey.Text);
}
+ const string OSM_URL = "http://www.openstreetmap.org/openlayers/OpenStreetMap.js";
const string GOOGLE_URL = "http://maps.google.com/maps/api/js?sensor=false";
const string YAHOO_URL = "http://api.maps.yahoo.com/ajaxymap?v=3.0&appid=";
const string BING_URL = "http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2";
Modified: branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.resx
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.resx 2012-07-31 13:02:20 UTC (rev 6924)
+++ branches/maestro-4.0.x/Maestro.Editors/Fusion/MapCtrl.resx 2012-07-31 13:16:36 UTC (rev 6925)
@@ -112,20 +112,20 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 22</value>
</data>
@@ -142,7 +142,7 @@
<value>label1</value>
</data>
<data name=">>label1.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>groupBox2</value>
@@ -166,7 +166,7 @@
<value>txtMapId</value>
</data>
<data name=">>txtMapId.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtMapId.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -199,7 +199,7 @@
<value>chkOverride</value>
</data>
<data name=">>chkOverride.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkOverride.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -220,7 +220,7 @@
<value>txtViewScale</value>
</data>
<data name=">>txtViewScale.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtViewScale.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -241,7 +241,7 @@
<value>txtViewY</value>
</data>
<data name=">>txtViewY.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtViewY.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -262,7 +262,7 @@
<value>txtViewX</value>
</data>
<data name=">>txtViewX.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtViewX.Parent" xml:space="preserve">
<value>groupBox1</value>
@@ -292,7 +292,7 @@
<value>label4</value>
</data>
<data name=">>label4.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>groupBox1</value>
@@ -322,7 +322,7 @@
<value>label3</value>
</data>
<data name=">>label3.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>groupBox1</value>
@@ -352,7 +352,7 @@
<value>label2</value>
</data>
<data name=">>label2.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>groupBox1</value>
@@ -373,7 +373,7 @@
<value>groupBox1</value>
</data>
<data name=">>groupBox1.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox1.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -403,7 +403,7 @@
<value>label5</value>
</data>
<data name=">>label5.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>
@@ -427,7 +427,7 @@
<value>txtMapDefinition</value>
</data>
<data name=">>txtMapDefinition.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtMapDefinition.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -457,7 +457,7 @@
<value>btnBrowseMdf</value>
</data>
<data name=">>btnBrowseMdf.Type" xml:space="preserve">
- <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>btnBrowseMdf.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -487,7 +487,7 @@
<value>chkSingleTiled</value>
</data>
<data name=">>chkSingleTiled.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkSingleTiled.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -517,7 +517,7 @@
<value>lblSelColor</value>
</data>
<data name=">>lblSelColor.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>lblSelColor.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -547,7 +547,7 @@
<value>chkSelectionAsOverlay</value>
</data>
<data name=">>chkSelectionAsOverlay.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkSelectionAsOverlay.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -568,7 +568,7 @@
<value>cmbSelectionColor</value>
</data>
<data name=">>cmbSelectionColor.Type" xml:space="preserve">
- <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=4.0.0.6282, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
+ <value>Maestro.Editors.Common.ColorComboBox, Maestro.Editors, Version=5.0.0.6640, Culture=neutral, PublicKeyToken=f526c48929fda856</value>
</data>
<data name=">>cmbSelectionColor.Parent" xml:space="preserve">
<value>groupBox2</value>
@@ -592,7 +592,7 @@
<value>groupBox2</value>
</data>
<data name=">>groupBox2.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>$this</value>
@@ -625,7 +625,7 @@
<value>chkOsmMapnik</value>
</data>
<data name=">>chkOsmMapnik.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkOsmMapnik.Parent" xml:space="preserve">
<value>groupBox6</value>
@@ -633,34 +633,34 @@
<data name=">>chkOsmMapnik.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <data name="chkOsmOsmarender.AutoSize" type="System.Boolean, mscorlib">
+ <data name="chkOsmTransportMap.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
- <data name="chkOsmOsmarender.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+ <data name="chkOsmTransportMap.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
- <data name="chkOsmOsmarender.Location" type="System.Drawing.Point, System.Drawing">
+ <data name="chkOsmTransportMap.Location" type="System.Drawing.Point, System.Drawing">
<value>11, 43</value>
</data>
- <data name="chkOsmOsmarender.Size" type="System.Drawing.Size, System.Drawing">
- <value>83, 17</value>
+ <data name="chkOsmTransportMap.Size" type="System.Drawing.Size, System.Drawing">
+ <value>92, 17</value>
</data>
- <data name="chkOsmOsmarender.TabIndex" type="System.Int32, mscorlib">
+ <data name="chkOsmTransportMap.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
- <data name="chkOsmOsmarender.Text" xml:space="preserve">
- <value>Osmarender</value>
+ <data name="chkOsmTransportMap.Text" xml:space="preserve">
+ <value>TransportMap</value>
</data>
- <data name=">>chkOsmOsmarender.Name" xml:space="preserve">
- <value>chkOsmOsmarender</value>
+ <data name=">>chkOsmTransportMap.Name" xml:space="preserve">
+ <value>chkOsmTransportMap</value>
</data>
- <data name=">>chkOsmOsmarender.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <data name=">>chkOsmTransportMap.Type" xml:space="preserve">
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
- <data name=">>chkOsmOsmarender.Parent" xml:space="preserve">
+ <data name=">>chkOsmTransportMap.Parent" xml:space="preserve">
<value>groupBox6</value>
</data>
- <data name=">>chkOsmOsmarender.ZOrder" xml:space="preserve">
+ <data name=">>chkOsmTransportMap.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="chkOsmCycleMap.AutoSize" type="System.Boolean, mscorlib">
@@ -685,7 +685,7 @@
<value>chkOsmCycleMap</value>
</data>
<data name=">>chkOsmCycleMap.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkOsmCycleMap.Parent" xml:space="preserve">
<value>groupBox6</value>
@@ -694,10 +694,10 @@
<value>2</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
- <value>361, 30</value>
+ <value>350, 30</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
- <value>103, 114</value>
+ <value>115, 114</value>
</data>
<data name="groupBox6.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
@@ -709,7 +709,7 @@
<value>groupBox6</value>
</data>
<data name=">>groupBox6.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox6.Parent" xml:space="preserve">
<value>grpCms</value>
@@ -739,7 +739,7 @@
<value>chkGoogTerrain</value>
</data>
<data name=">>chkGoogTerrain.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkGoogTerrain.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -769,7 +769,7 @@
<value>chkGoogStreets</value>
</data>
<data name=">>chkGoogStreets.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkGoogStreets.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -799,7 +799,7 @@
<value>chkGoogSatellite</value>
</data>
<data name=">>chkGoogSatellite.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkGoogSatellite.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -829,7 +829,7 @@
<value>chkGoogHybrid</value>
</data>
<data name=">>chkGoogHybrid.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkGoogHybrid.Parent" xml:space="preserve">
<value>groupBox5</value>
@@ -853,7 +853,7 @@
<value>groupBox5</value>
</data>
<data name=">>groupBox5.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox5.Parent" xml:space="preserve">
<value>grpCms</value>
@@ -883,7 +883,7 @@
<value>chkBingStreets</value>
</data>
<data name=">>chkBingStreets.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkBingStreets.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -913,7 +913,7 @@
<value>chkBingSatellite</value>
</data>
<data name=">>chkBingSatellite.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkBingSatellite.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -943,7 +943,7 @@
<value>chkBingHybrid</value>
</data>
<data name=">>chkBingHybrid.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkBingHybrid.Parent" xml:space="preserve">
<value>groupBox4</value>
@@ -967,7 +967,7 @@
<value>groupBox4</value>
</data>
<data name=">>groupBox4.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox4.Parent" xml:space="preserve">
<value>grpCms</value>
@@ -997,7 +997,7 @@
<value>chkYahooStreets</value>
</data>
<data name=">>chkYahooStreets.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkYahooStreets.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -1027,7 +1027,7 @@
<value>chkYahooSatellite</value>
</data>
<data name=">>chkYahooSatellite.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkYahooSatellite.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -1057,7 +1057,7 @@
<value>chkYahooHybrid</value>
</data>
<data name=">>chkYahooHybrid.Type" xml:space="preserve">
- <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>chkYahooHybrid.Parent" xml:space="preserve">
<value>groupBox3</value>
@@ -1069,7 +1069,7 @@
<value>252, 30</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
- <value>103, 114</value>
+ <value>92, 114</value>
</data>
<data name="groupBox3.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
@@ -1081,7 +1081,7 @@
<value>groupBox3</value>
</data>
<data name=">>groupBox3.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>groupBox3.Parent" xml:space="preserve">
<value>grpCms</value>
@@ -1111,7 +1111,7 @@
<value>txtYahooApiKey</value>
</data>
<data name=">>txtYahooApiKey.Type" xml:space="preserve">
- <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>txtYahooApiKey.Parent" xml:space="preserve">
<value>grpCms</value>
@@ -1141,7 +1141,7 @@
<value>label7</value>
</data>
<data name=">>label7.Type" xml:space="preserve">
- <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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>grpCms</value>
@@ -1165,7 +1165,7 @@
<value>grpCms</value>
</data>
<data name=">>grpCms.Type" xml:space="preserve">
- <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name=">>grpCms.Parent" xml:space="preserve">
<value>$this</value>
@@ -1173,7 +1173,7 @@
<data name=">>grpCms.ZOrder" xml:space="preserve">
<value>0</value>
</data>
- <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
@@ -1183,6 +1183,6 @@
<value>MapCtrl</value>
</data>
<data name=">>$this.Type" xml:space="preserve">
- <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
Modified: branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs
===================================================================
--- branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2012-07-31 13:02:20 UTC (rev 6924)
+++ branches/maestro-4.0.x/Maestro.Editors/LayerDefinition/Vector/Thematics/ThemeCreator.cs 2012-07-31 13:16:36 UTC (rev 6925)
@@ -767,10 +767,24 @@
{
IPointVectorStyle col = m_ruleCollection as IPointVectorStyle;
+ string fillAlpha = "";
IPointRule template = null;
if (chkUseFirstRuleAsTemplate.Checked && col.RuleCount > 0)
{
template = col.GetRuleAt(0);
+ var sym = template.PointSymbolization2D.Symbol;
+ if (sym.Type == PointSymbolType.Mark)
+ {
+ string htmlColor = ((IMarkSymbol)sym).Fill.ForegroundColor;
+ if (htmlColor.Length == 8)
+ fillAlpha = htmlColor.Substring(0, 2);
+ }
+ else if (sym.Type == PointSymbolType.Font)
+ {
+ string htmlColor = ((IFontSymbol)sym).ForegroundColor;
+ if (htmlColor.Length == 8)
+ fillAlpha = htmlColor.Substring(0, 2);
+ }
}
if (OverwriteRules.Checked)
@@ -784,11 +798,11 @@
var sym = r.PointSymbolization2D.Symbol;
if (sym.Type == PointSymbolType.Mark)
{
- ((IMarkSymbol)sym).Fill.ForegroundColor = Utility.SerializeHTMLColor(entry.Color, true);
+ ((IMarkSymbol)sym).Fill.ForegroundColor = fillAlpha + Utility.SerializeHTMLColor(entry.Color, string.IsNullOrEmpty(fillAlpha));
}
else if (sym.Type == PointSymbolType.Font)
{
- ((IFontSymbol)sym).ForegroundColor = Utility.SerializeHTMLColor(entry.Color, true);
+ ((IFontSymbol)sym).ForegroundColor = fillAlpha + Utility.SerializeHTMLColor(entry.Color, string.IsNullOrEmpty(fillAlpha));
}
col.AddRule(r);
}
@@ -797,10 +811,21 @@
{
ILineVectorStyle col = m_ruleCollection as ILineVectorStyle;
+ string bordAlpha = "";
ILineRule template = null;
if (chkUseFirstRuleAsTemplate.Checked && col.RuleCount > 0)
{
template = col.GetRuleAt(0);
+
+ //TODO: Composite lines? Which "alpha" value wins there?
+ foreach (var st in template.Strokes)
+ {
+ if (st.Color.Length == 8)
+ {
+ bordAlpha = st.Color.Substring(0, 2);
+ break;
+ }
+ }
}
if (OverwriteRules.Checked)
@@ -813,7 +838,7 @@
l.LegendLabel = entry.Label;
foreach (var st in l.Strokes)
{
- st.Color = Utility.SerializeHTMLColor(entry.Color, true);
+ st.Color = bordAlpha + Utility.SerializeHTMLColor(entry.Color, string.IsNullOrEmpty(bordAlpha));
}
col.AddRule(l);
}
@@ -822,10 +847,20 @@
{
IAreaVectorStyle col = m_ruleCollection as IAreaVectorStyle;
+ string fillAlpha = "";
IAreaRule template = null;
if (chkUseFirstRuleAsTemplate.Checked && col.RuleCount > 0)
{
template = col.GetRuleAt(0);
+
+ if (template.AreaSymbolization2D != null)
+ {
+ if (template.AreaSymbolization2D.Fill != null)
+ {
+ if (template.AreaSymbolization2D.Fill.ForegroundColor.Length == 8)
+ fillAlpha = template.AreaSymbolization2D.Fill.ForegroundColor.Substring(0, 2);
+ }
+ }
}
if (OverwriteRules.Checked)
@@ -836,7 +871,7 @@
var r = (template != null) ? CreateAreaRule(template, _factory) : _factory.CreateDefaultAreaRule();
r.Filter = entry.Filter;
r.LegendLabel = entry.Label;
- r.AreaSymbolization2D.Fill.ForegroundColor = Utility.SerializeHTMLColor(entry.Color, true);
+ r.AreaSymbolization2D.Fill.ForegroundColor = fillAlpha + Utility.SerializeHTMLColor(entry.Color, string.IsNullOrEmpty(fillAlpha));
col.AddRule(r);
}
More information about the mapguide-commits
mailing list