Changeset 1779

Timestamp:

02/18/09 16:30:56 (4 years ago)

Author:

pvalsecc

Message:

Implemented a crude "limit by condition" and wired the "apply" button

Location:

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler

Files:

• ClassPropertiesPanel.js (modified) (6 diffs)
• tools/MapFileToStylerVisitor.js (modified) (2 diffs)
• tools/StylerPanel.js (modified) (1 diff)
• tools/StylerToMapFileVisitor.js (modified) (3 diffs)
• widgets/FillStylePanel.js (modified) (1 diff)
• widgets/LimitByConditionPanel.js (modified) (1 diff)
• widgets/StrokeStylePanel.js (modified) (2 diffs)

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/ClassPropertiesPanel.js

@@ -1 +1 @@
 Ext.namespace('Studio', 'Studio.MapfileMgr');
 
-Studio.MapfileMgr.ClassPropertiesPanel = Ext.extend(Studio.MapfileMgr.StylerPanel, {
+Studio.MapfileMgr.ClassPropertiesPanel = Ext.extend(Studio.MapfileMgr.StylerForm, {
 
     title: 'CLASS object properties',
@@ -20 +20 @@
      */
     mapfile: null,
+
+    /**
+     * Property: clazz
+     * The MapFile class being edited
+     * {Object}
+     */
+    clazz: null,
 
     createAddButton: function(clazz, opts) {
@@ -44 +51 @@
             tooltip: 'Apply modifications',
             //disabled: true,  // TODO disabled first, enabled when form is modified
-            handler: function() {
-
-                Ext.getCmp('studio.mm.panel').saveMapFile();
-            },
+            handler: this.apply,
             scope: this
         }];
@@ -203 +207 @@
     //TODO: this must be passed during construction
     setData: function(mapfile, layerIndex, classIndex) {
-        var clazz = mapfile.getClass(layerIndex, classIndex);
-
-        this.visitStyler(new Studio.MapfileMgr.MapFileToStylerVisitor(clazz, this.mapfile));
+        this.clazz = mapfile.getClass(layerIndex, classIndex);
+
+        this.visitStyler(new Studio.MapfileMgr.MapFileToStylerVisitor(this.clazz, this.mapfile));
         this.doLayout();
         this.doLayout(); //have to do it twice for style fieldsets
@@ -272 +276 @@
                 this.getStyles().remove(styleFieldSet);
                 this.updateStyleButtons();
-                this.doLayout();                
+                this.doLayout();
             },
             scope: this
@@ -283 +287 @@
         }
         return this.styles;
+    },
+
+    apply: function() {
+        this.visitStyler(new Studio.MapfileMgr.StylerToMapFileVisitor(this.clazz));
+        Ext.getCmp('studio.mm.panel').saveMapFile();
     }
 });

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/tools/MapFileToStylerVisitor.js

@@ -47 +47 @@
                 if (json.expression) {
                     panel.ownerCt.expand();
-                    return new Studio.MapfileMgr.MapFileToStylerVisitor.Simple(json);
+                    return new Studio.MapfileMgr.MapFileToStylerVisitor.LimitByCondition(json.expression);
                 } else {
                     panel.ownerCt.collapse();
@@ -115 +115 @@
     };
 };
+
+Studio.MapfileMgr.MapFileToStylerVisitor.LimitByCondition = function(expression) {
+    var regexp=/^\(\s*\[([^\]]+)\]\s*([!=<>]*)\s*"?([^"]*)"?\)$/;
+    var matches=regexp(expression);
+    var exploded;
+    if(!matches) {
+        alert("Cannot parse expression: "+expression);
+        exploded={};
+    } else {
+        exploded={
+            attribute: matches[1],
+            operator: matches[2],
+            value: matches[3]
+        };
+    }
+
+    return {
+        beginPanel: function(panel) {
+            return this;
+        },
+
+        endPanel: function(panel) {
+        },
+
+        value: function(component, name, value) {
+            return Studio.MapfileMgr.MapFileToStylerVisitor.getValue(exploded, component, name);
+        }
+    };
+};

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/tools/StylerPanel.js

@@ -18 +18 @@
             if (subVisitor) {
                 Studio.MapfileMgr.StylerPanel.visitItems(this, subVisitor);
+                if(subVisitor.destroy) subVisitor.destroy();
             }
             visitor.endPanel(this);

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/tools/StylerToMapFileVisitor.js

@@ -17 +17 @@
             } else if (panelType == 'studio.mm.limitbycondition') {
                 if (!panel.ownerCt.collapsed) {
-                    return new Studio.MapfileMgr.StylerToMapFileVisitor.Simple(json);
+                    return new Studio.MapfileMgr.StylerToMapFileVisitor.LimitByCondition(json);
                 } else {
                     delete json.expression;
@@ -58 +58 @@
         delete json[name];
 
-    } else if(component.isXType('gx_colorfield')) {
-        var hex=component.getHexValue();
+    } else if (component.isXType('gx_colorfield')) {
+        var hex = component.getHexValue();
+
         function toDec(val, pos) {
-            return parseInt(val.substring(pos, pos+2), 16);
+            return parseInt(val.substring(pos, pos + 2), 16);
         }
+
         json[name] = [toDec(hex, 1), toDec(hex, 3), toDec(hex, 5)];
 
@@ -85 +87 @@
     };
 };
+
+Studio.MapfileMgr.StylerToMapFileVisitor.LimitByCondition = function(json) {
+    var exploded = {};
+
+    return {
+        beginPanel: function(panel) {
+            return this;
+        },
+
+        endPanel: function(panel) {
+        },
+
+        value: function(component, name, value) {
+            return Studio.MapfileMgr.StylerToMapFileVisitor.updateValue(exploded, component, name, value);
+        },
+
+        destroy: function() {
+            if (exploded.attribute !== "" && exploded.operator) {
+                json.expression = "([" + exploded.attribute + "]" + exploded.operator + exploded.value + ")";
+            } else {
+                delete json.expression;
+            }
+        }
+    };
+};

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/widgets/FillStylePanel.js

@@ -22 +22 @@
             xtype: 'studio.mm.colorpickerfield',
             fieldLabel: 'Color',
-            name: 'color'
+            name: 'color',
+            allowBlank: false
         },{
             xtype: 'studio.mm.symbolcombo',

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/widgets/LimitByConditionPanel.js

@@ -13 +13 @@
         this.items = [{
             xtype: 'textfield',
-            fieldLabel: 'Condition',
-            name: 'expression'
+            fieldLabel: 'Attribute',
+            name: 'attribute'
+        },{
+            xtype: 'textfield',
+            fieldLabel: 'Operator',
+            name: 'operator'
+        },{
+            xtype: 'textfield',
+            fieldLabel: 'Value',
+            name: 'value'
         }];
         Studio.MapfileMgr.LimitByConditionPanel.superclass.initComponent.apply(this, arguments);

sandbox/camptocamp/Studio/studio/public/js/Studio/MapfileMgr/styler/widgets/StrokeStylePanel.js

@@ -22 +22 @@
             xtype: 'studio.mm.colorpickerfield',
             fieldLabel: 'Color',
-            name: "color"
+            name: "color",
+            allowBlank: false
         },{
             xtype: 'studio.mm.colorpickerfield',
@@ -30 +31 @@
             xtype: 'studio.mm.numberspinner',
             fieldLabel: 'Size',
+            width: 40,
             name: 'size',
             minValue: 1