[mapguide-commits] r5990 - in trunk/Tools/Maestro: Generated Maestro.Editors/LayerDefinition OSGeo.MapGuide.MaestroAPI/ObjectModels

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Jul 21 07:33:16 EDT 2011


Author: jng
Date: 2011-07-21 04:33:16 -0700 (Thu, 21 Jul 2011)
New Revision: 5990

Modified:
   trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
   trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
   trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
Log:
Fix broken support for Layer Definitions using the 2.3.0 schema. Now not only can you create such resources, but you can attach watermarks to them at the layer level


Modified: trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs
===================================================================
--- trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs	2011-07-19 01:59:33 UTC (rev 5989)
+++ trunk/Tools/Maestro/Generated/LayerDefinition-2.3.0.designer.cs	2011-07-21 11:33:16 UTC (rev 5990)
@@ -35,7 +35,7 @@
         private static System.Xml.Serialization.XmlSerializer serializer;
         
         public LayerDefinition() {
-            this.versionField = "1.3.0";
+            this.versionField = "2.3.0";
         }
         
         [System.Xml.Serialization.XmlAttributeAttribute()]

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs	2011-07-19 01:59:33 UTC (rev 5989)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.Designer.cs	2011-07-21 11:33:16 UTC (rev 5990)
@@ -40,7 +40,6 @@
             resources.ApplyResources(this.resSettings, "resSettings");
             this.resSettings.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
             this.resSettings.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.resSettings.HeaderText = "Resource Settings";
             this.resSettings.Name = "resSettings";
             // 
             // layerProperties
@@ -49,7 +48,6 @@
             resources.ApplyResources(this.layerProperties, "layerProperties");
             this.layerProperties.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
             this.layerProperties.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.layerProperties.HeaderText = "Layer Properties Visible in Viewer";
             this.layerProperties.Name = "layerProperties";
             // 
             // layerStyles
@@ -58,7 +56,6 @@
             resources.ApplyResources(this.layerStyles, "layerStyles");
             this.layerStyles.HeaderBackgroundColor = System.Drawing.Color.LightSteelBlue;
             this.layerStyles.HeaderFont = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.layerStyles.HeaderText = "Layer Styles";
             this.layerStyles.Name = "layerStyles";
             // 
             // VectorLayerEditorCtrl

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2011-07-19 01:59:33 UTC (rev 5989)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.cs	2011-07-21 11:33:16 UTC (rev 5990)
@@ -9,6 +9,7 @@
 using OSGeo.MapGuide.ObjectModels.FeatureSource;
 using OSGeo.MapGuide.MaestroAPI;
 using OSGeo.MapGuide.MaestroAPI.Schema;
+using Maestro.Editors.WatermarkDefinition;
 
 namespace Maestro.Editors.LayerDefinition
 {
@@ -52,6 +53,23 @@
             resSettings.Bind(service);
             layerProperties.Bind(service);
             layerStyles.Bind(service);
+
+            //Add watermark component if supported
+            var sl2 = _vl as ISubLayerDefinition2;
+            if (sl2 != null)
+            {
+                this.Controls.Remove(resSettings);
+                this.Controls.Remove(layerProperties);
+                this.Controls.Remove(layerStyles);
+
+                var wm = new WatermarkCollectionEditorCtrl(service.ResourceService, sl2);
+                wm.Dock = DockStyle.Top;
+
+                this.Controls.Add(wm);
+                this.Controls.Add(layerStyles);
+                this.Controls.Add(layerProperties);
+                this.Controls.Add(resSettings);
+            }
         }
 
         /// <summary>

Modified: trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx
===================================================================
--- trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx	2011-07-19 01:59:33 UTC (rev 5989)
+++ trunk/Tools/Maestro/Maestro.Editors/LayerDefinition/VectorLayerEditorCtrl.resx	2011-07-21 11:33:16 UTC (rev 5990)
@@ -121,12 +121,15 @@
   <data name="resSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
+  <data name="resSettings.HeaderText" xml:space="preserve">
+    <value>Resource Settings</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="resSettings.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="resSettings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>638, 267</value>
+    <value>621, 267</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="resSettings.TabIndex" type="System.Int32, mscorlib">
@@ -136,7 +139,7 @@
     <value>resSettings</value>
   </data>
   <data name="&gt;&gt;resSettings.Type" xml:space="preserve">
-    <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+    <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerSettingsSectionCtrl, Maestro.Editors, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;resSettings.Parent" xml:space="preserve">
     <value>$this</value>
@@ -147,11 +150,14 @@
   <data name="layerProperties.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
+  <data name="layerProperties.HeaderText" xml:space="preserve">
+    <value>Layer Properties Visible in Viewer</value>
+  </data>
   <data name="layerProperties.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 267</value>
   </data>
   <data name="layerProperties.Size" type="System.Drawing.Size, System.Drawing">
-    <value>638, 235</value>
+    <value>621, 235</value>
   </data>
   <data name="layerProperties.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -160,7 +166,7 @@
     <value>layerProperties</value>
   </data>
   <data name="&gt;&gt;layerProperties.Type" xml:space="preserve">
-    <value>Maestro.Editors.LayerDefinition.LayerPropertiesSectionCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+    <value>Maestro.Editors.LayerDefinition.LayerPropertiesSectionCtrl, Maestro.Editors, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;layerProperties.Parent" xml:space="preserve">
     <value>$this</value>
@@ -171,11 +177,14 @@
   <data name="layerStyles.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
+  <data name="layerStyles.HeaderText" xml:space="preserve">
+    <value>Layer Styles</value>
+  </data>
   <data name="layerStyles.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 502</value>
   </data>
   <data name="layerStyles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>638, 539</value>
+    <value>621, 432</value>
   </data>
   <data name="layerStyles.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -184,7 +193,7 @@
     <value>layerStyles</value>
   </data>
   <data name="&gt;&gt;layerStyles.Type" xml:space="preserve">
-    <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+    <value>Maestro.Editors.LayerDefinition.Vector.VectorLayerStyleSectionCtrl, Maestro.Editors, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;layerStyles.Parent" xml:space="preserve">
     <value>$this</value>
@@ -199,12 +208,12 @@
     <value>True</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>638, 530</value>
+    <value>621, 530</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>VectorLayerEditorCtrl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=3.1.0.5859, Culture=neutral, PublicKeyToken=null</value>
+    <value>Maestro.Editors.EditorBase, Maestro.Editors, Version=3.5.0.5977, Culture=neutral, PublicKeyToken=null</value>
   </data>
 </root>
\ No newline at end of file

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs	2011-07-19 01:59:33 UTC (rev 5989)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/LayerFactory.cs	2011-07-21 11:33:16 UTC (rev 5990)
@@ -84,7 +84,12 @@
 
         public void CreateVectorLayer()
         {
-            var vl = new VectorLayerDefinitionType();
+            var vl = new VectorLayerDefinitionType()
+            {
+#if LDF_230
+                Watermarks = new System.ComponentModel.BindingList<OSGeo.MapGuide.ObjectModels.WatermarkDefinition_2_3_0.WatermarkType>()
+#endif
+            };
 
             //TODO: Create composite type style if 1.2 or 1.3 schema
 
@@ -94,7 +99,11 @@
                 Items = new System.ComponentModel.BindingList<object>(),
                 AreaStyle = CreateDefaultAreaStyle(),
                 LineStyle = CreateDefaultLineStyle(),
-                PointStyle = CreateDefaultPointStyle()
+                PointStyle = CreateDefaultPointStyle(),
+#if LDF_100 || LDF_110
+#else
+                CompositeStyle = CreateDefaultCompositeStyle()
+#endif
             };
             vl.VectorScaleRange.Add(defaultRange);
 
@@ -361,10 +370,16 @@
 #if LDF_100
             throw new NotImplementedException();
 #else
-            return new CompositeTypeStyle()
+            var cts = new CompositeTypeStyle()
             {
-                CompositeRule = new System.ComponentModel.BindingList<CompositeRule>()
+                CompositeRule = new System.ComponentModel.BindingList<CompositeRule>(),
+#if LDF_110 || LDF_120
+#else
+                ShowInLegend = true,
+#endif
             };
+            cts.AddCompositeRule(CreateDefaultCompositeRule());
+            return cts;
 #endif
         }
     }

Modified: trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs
===================================================================
--- trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2011-07-19 01:59:33 UTC (rev 5989)
+++ trunk/Tools/Maestro/OSGeo.MapGuide.MaestroAPI/ObjectModels/VectorLayerDefinitionImpl.cs	2011-07-21 11:33:16 UTC (rev 5990)
@@ -56,6 +56,7 @@
         public abstract LayerType LayerType { get; }
 
 #if LDF_230
+        [XmlIgnore]
         IEnumerable<OSGeo.MapGuide.ObjectModels.WatermarkDefinition.IWatermark> IWatermarkCollection.Watermarks
         {
             get 
@@ -79,6 +80,7 @@
                 this.Watermarks.Remove(wm);
         }
 
+        [XmlIgnore]
         int IWatermarkCollection.WatermarkCount
         {
             get { return this.Watermarks.Count; }
@@ -1380,6 +1382,8 @@
         private static readonly Version RES_VERSION = new Version(1, 2, 0);
         #elif LDF_130
         private static readonly Version RES_VERSION = new Version(1, 3, 0);
+        #elif LDF_230
+        private static readonly Version RES_VERSION = new Version(2, 3, 0);
         #else
         private static readonly Version RES_VERSION = new Version(1, 0, 0);
         #endif
@@ -1446,6 +1450,8 @@
             get { return "LayerDefinition-1.2.0.xsd"; }
 #elif LDF_130
             get { return "LayerDefinition-1.3.0.xsd"; }
+#elif LDF_230
+            get { return "LayerDefinition-2.3.0.xsd"; }
 #else
             get { return "LayerDefinition-1.0.0.xsd"; }
 #endif



More information about the mapguide-commits mailing list