[Commits] r677 - in sandbox/bartvde/legend/geoext: examples lib/GeoExt/widgets lib/GeoExt/widgets/legend lib/GeoExt/widgets/tree

[commits at geoext.org]

Author: bartvde
Date: 2009-05-11 16:30:51 +0200 (Mon, 11 May 2009)
New Revision: 677

Modified:
   sandbox/bartvde/legend/geoext/examples/tree.js
   sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/LegendPanel.js
   sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/legend/Vector.js
   sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/tree/LayerNode.js
Log:
temporary changes

Modified: sandbox/bartvde/legend/geoext/examples/tree.js
===================================================================
--- sandbox/bartvde/legend/geoext/examples/tree.js	2009-05-11 09:24:03 UTC (rev 676)
+++ sandbox/bartvde/legend/geoext/examples/tree.js	2009-05-11 14:30:51 UTC (rev 677)
@@ -70,7 +70,8 @@
                     singleTile: true,
                     // exclude this layer from layer container nodes
                     displayInLayerSwitcher: false
-                })
+                }),
+            new OpenLayers.Layer.Vector("vector")
         ]
     });
     
@@ -92,7 +93,7 @@
             buttons: [{
                 text: "Save",
                 handler: function() {
-                    var value = Ext.getCmp("treeconfig").getValue()
+                    var value = Ext.getCmp("treeconfig").getValue();
                     try {
                         var root = tree.getRootNode();
                         root.attributes.children = Ext.decode(value);
@@ -152,14 +153,14 @@
                 alert(node.layer.name + " is now the the active layer.");
             });
         }
-    }
+    };
     tree.on({
         "insert": registerRadio,
         "append": registerRadio,
         scope: this
     });
     
-    new Ext.Viewport({
+    var viewport = new Ext.Viewport({
         layout: "fit",
         hideBorders: true,
         items: {

Modified: sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/LegendPanel.js
===================================================================
--- sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/LegendPanel.js	2009-05-11 09:24:03 UTC (rev 676)
+++ sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/LegendPanel.js	2009-05-11 14:30:51 UTC (rev 677)
@@ -1,5 +1,14 @@
 Ext.namespace('GeoExt', 'GeoExt.legend');
 
+GeoExt.legend.generateIconBox = function(options) {
+    if (options.layer instanceof OpenLayers.Layer.Vector) {
+        var legend = GeoExt.legend.Vector(options);
+        return legend;
+    } else {
+        return null;
+    }
+};
+
 GeoExt.legend.generateLegendImage = function(options) {
     if (options.layer instanceof OpenLayers.Layer.WMS) {
         return options.layer.getFullRequestString({

Modified: sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/legend/Vector.js
===================================================================
--- sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/legend/Vector.js	2009-05-11 09:24:03 UTC (rev 676)
+++ sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/legend/Vector.js	2009-05-11 14:30:51 UTC (rev 677)
@@ -2,6 +2,6 @@
 
 GeoExt.legend.Vector = function(config) {
     return new GeoExt.FeatureRenderer({
-        symbolizer: config.layer.styleMap.styles.default.defaultStyle
+        symbolizer: config.layer.styleMap.styles["default"].defaultStyle
     });
 };

Modified: sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/tree/LayerNode.js
===================================================================
--- sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/tree/LayerNode.js	2009-05-11 09:24:03 UTC (rev 676)
+++ sandbox/bartvde/legend/geoext/lib/GeoExt/widgets/tree/LayerNode.js	2009-05-11 14:30:51 UTC (rev 677)
@@ -36,13 +36,21 @@
     render: function(bulkRender) {
         GeoExt.tree.LayerNodeUI.superclass.render.call(this, bulkRender);
         var a = this.node.attributes;
+        if (a.iconBox) {
+            this.iconBoxDiv = Ext.DomHelper.insertBefore(this.getIconEl(),
+                ['<span class="x-tree-node-indent"></span>']);
+            //Ext.get(this.iconBoxDiv).addClass(['x-tree-node-indent']);
+            var el = Ext.get(this.getIconEl());
+            el.replaceWith(this.iconBoxDiv);
+            a.iconBox.render(this.iconBoxDiv);
+        }
         if (a.radioGroup && this.radio !== undefined) {
             this.radio = Ext.DomHelper.insertAfter(this.checkbox,
                 ['<input type="radio" class="x-tree-node-radio" name="',
                 a.radioGroup, '_radio"></input>'].join(""));
         }
     },
-    
+
     /**
      * Method: onClick
      * 
@@ -162,7 +170,7 @@
         // to always get the checkbox rendered
         config.checked = false;
 
-        config.icon = GeoExt.legend.generateLegendImage({layer: config.layer, height: 18, width: 16});
+        config.iconBox = GeoExt.legend.generateIconBox({layer: config.layer, height: 18, width: 16});
 
         this.defaultUI = this.defaultUI || GeoExt.tree.LayerNodeUI;
         this.addEvents(