[Commits] r2898 - in sandbox/mapgears/geoext.ux/ux/WMSBrowser: lib/GeoExt.ux/widgets lib/GeoExt.ux/widgets/tree resources/css resources/images
commits at geoext.org
commits at geoext.org
Fri Dec 14 13:45:28 CET 2012
Author: sbrunner
Date: 2012-12-14 13:45:28 +0100 (Fri, 14 Dec 2012)
New Revision: 2898
Added:
sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/decline.png
sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/information.png
Modified:
sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js
sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserRootNode.js
sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js
sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/css/WMSBrowser.css
Log:
Add queryable and compatible informations to tree panel
Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js 2012-12-14 12:45:27 UTC (rev 2897)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/WMSBrowser.js 2012-12-14 12:45:28 UTC (rev 2898)
@@ -143,6 +143,9 @@
/** api: config[errorText] ``String`` i18n */
errorText: "Error",
+
+ /** api: config[errorText] ``String`` i18n */
+ queryableTooltip: 'This layer is queryable',
/* end i18n */
/** api: config[layerStore]
Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserRootNode.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserRootNode.js 2012-12-14 12:45:27 UTC (rev 2897)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserRootNode.js 2012-12-14 12:45:28 UTC (rev 2898)
@@ -44,6 +44,41 @@
*/
constructor: function(config) {
Ext.apply(this, config);
+
+ var self = this;
+ var wmsBrowserTreeNodeUI = Ext.extend(Ext.tree.TreeNodeUI, {
+ renderElements: function(n, a, targetNode, bulkRender) {
+ Ext.tree.TreeNodeUI.prototype.renderElements.apply(this, arguments);
+ if (n.childNodes.length === 0) {
+ this.onIconClsChange(n);
+ }
+ },
+ onIconClsChange: function(node, cls, oldCls) {
+ if (this.rendered) {
+ var iconCls = 'x-tree-node-noicon';
+ var elem = Ext.fly(this.iconNode);
+ elem.dom.title = '';
+
+ var compatible = self.wmsbrowser.treePanel.isLayerCompatible(
+ node.attributes.layer, true);
+ if (!compatible.compatible) {
+ iconCls = 'x-tree-node-icon-unsupported';
+ var message =
+ self.wmsbrowser.layerCantBeAddedText + '\n' +
+ compatible.reasons.join(',\n');
+ elem.dom.title = message;
+ }
+ else if (node.attributes.layer.queryable) {
+ iconCls = 'x-tree-node-icon-queryable';
+ elem.dom.title = self.wmsbrowser.queryableTooltip;
+ }
+
+ elem.replaceClass(this.iconCls, iconCls);
+ this.iconCls = iconCls;
+ }
+ }
+ });
+ this.loader = new GeoExt.tree.WMSCapabilitiesLoader({
Ext.apply(this, {loader: new GeoExt.tree.WMSCapabilitiesLoader({
url: "__foo__",
layerOptions: {buffer: 0, ratio: 1},
@@ -51,9 +86,13 @@
// customize the createNode method to add a checkbox to nodes
createNode: function(attr) {
attr.checked = attr.leaf ? false : undefined;
+ attr.uiProvider = 'wmsbrowser';
return GeoExt.tree.WMSCapabilitiesLoader.prototype.createNode.apply(this, [attr]);
+ },
+ uiProviders: {
+ wmsbrowser: wmsBrowserTreeNodeUI
}
- })});
+ });
arguments.callee.superclass.constructor.call(this, config);
Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js 2012-12-14 12:45:27 UTC (rev 2897)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/lib/GeoExt.ux/widgets/tree/WMSBrowserTreePanel.js 2012-12-14 12:45:28 UTC (rev 2898)
@@ -242,7 +242,7 @@
* - support the current map projection
* - must at least intersects the map maxextent
*/
- isLayerCompatible: function(layer) {
+ isLayerCompatible: function(layer, onlyGetMessage) {
var compatible = true;
var reasons = [];
@@ -288,7 +288,7 @@
}
// output a message if not valid
- if (!compatible) {
+ if (!compatible && !onlyGetMessage) {
var layerName = "";
if (layer.metadata.title != "") {
layerName = layer.metadata.title + " : ";
@@ -299,6 +299,9 @@
this.wmsbrowser.fireEvent('genericerror', message);
}
- return compatible;
+ return onlyGetMessage ? {
+ compatible: compatible,
+ reasons: reasons
+ } : compatible;
}
});
Modified: sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/css/WMSBrowser.css
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/css/WMSBrowser.css 2012-12-14 12:45:27 UTC (rev 2897)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/css/WMSBrowser.css 2012-12-14 12:45:28 UTC (rev 2898)
@@ -2,3 +2,12 @@
padding: 0px;
margin: 0px;
}
+.x-tree-node-leaf .x-tree-node-noicon {
+ background-image: none;
+}
+.x-tree-node-leaf .x-tree-node-icon-unsupported {
+ background-image: url("../images/decline.png");
+}
+.x-tree-node-leaf .x-tree-node-icon-queryable {
+ background-image: url("../images/information.png");
+}
Added: sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/decline.png
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/decline.png (rev 0)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/decline.png 2012-12-14 12:45:28 UTC (rev 2898)
@@ -0,0 +1,10 @@
+PNG
+
+
+IHDR óÿa tEXtSoftware Adobe ImageReadyqÉe< µIDATxÚ¤mKQÇÿgº®|f¥T¬Z¤¢¹È¬^´} G_¡ïàËÀÐ0454E!B JÒ|ù°lÚ4u»ïóйoröÎëÅáÃ}ý¯ß}ý¯C8M$j!$~ôx
+ãMÌ-5CºÅÀ»¸`Ý¥=ãoµâD_þ
+¬µy\³vk±=Çâp³Ñ(ÔÐvÆÆ°»Þdyʼý¾Z2c¬3ýnÅrí*ØÒ<Z$%
+$?áÁ!¬|;à¶ÞìñÅ$vÄögÔVÚÌ×Á&pxa*LF. (PRíQ|7¸ 5UïÆ:
+ãÍf[-ùJ ØÔ0Ý/\^
+ãáø¯0£¦¶Pý£Èr:ÙgÍZ®.À k±/Ìâwpêô$LÕõ0ß¡¨ÆûP?M at p.ã¨$h» h6 TÅÞÛ×HÝý¤'nSõ¿A¤·Wo´q_Åò[à³47N í߸ûTdÊrTóX?¥ChÔÿ¬®Ø-Ò¶Ð6R[`ª½hÄ`@«gÓ2éxÓù,/«t=NÀ8õgf lvUOM~À^_">bÃ>Ù;²PíÎMh=ðêC¨Ùøåù³fþL³Õî¬ÃÑÀ ¤×Òí¸k}øÁñ!Ìo0"jÎ/ÅésÓ#TíÌJÉ°d9롬 à
+GÒe;Ly°öq +áÅNxkÃûßQn¼çÛMLÉÉ+ÞgÛôûà sS8dÑMìÑÿû´ð?½](¨ÚD¸[p9$÷[rßÅ)ínùzò1&þ0 &D7ê4 IEND®B`
\ No newline at end of file
Added: sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/information.png
===================================================================
--- sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/information.png (rev 0)
+++ sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/information.png 2012-12-14 12:45:28 UTC (rev 2898)
@@ -0,0 +1,13 @@
+PNG
+
+
+IHDR óÿa gAMA ¯È7é tEXtSoftware Adobe ImageReadyqÉe< IDAT8Ë¥ËkÔWÅ?wL¬dL&1
+6Ѩ(h¡R,ÅM!R;TA¢.\tm\ù
+>V¾°¥t®
Z΢Æ0ÕÄ4Ñ3É$ýÍÜï½÷ëBH|´=Ë/_>8çUå}Tóæ!su4-ÁWNV´8
+(¡á¦wáÎàÙO¾úo^uðŵr±#¡É¶FÖ®`!rpzy£ý¹óeß¾ÏØHnÚVßÝZÏÔ¥¸á¨[C*±Â³2??\¦S¹³+ÞK÷;EÜСñÔözrc%ö´5*Ícb]Éõü3_槻
i4|»vôQ@ëëhÐÔdÃ
çØÈ"Õ@ïÇIz»SlÕ,Ѿ1A×ÖFÒ°ÞØ×ÞÌXq AÇÇÃd'°b±Î²EÏ.r`oÆÚ+)Øȶ6Õ×P)á¼G¼ !Ðw°G¦Ñ Cqn®ÔfÔG«ª
+S°®Jðüãyþ8¼uxñ8q8+¨¼g ~jn¹Bs¼£14(Á{^&¤xqXñx²XÆ0µ
+°îÖ`~¶Mqrd;;?l¢n]-ýGö "8:Z
+ý
+èÕ&V¢Û#Ê_§©®Müäû_GùöÞ_¨8TòÑö-y/L¸ýZºOÑråÆç_îwn¬çÁãYf .°¡±m[/-qï_1µ§rßdߪr÷±ëÔ^LïJ&ìKÓ¼~- <]¨0øû(ùÂ1±þÜÀìn ç«+iU
+' 4`)7
+rçsÿ?¦wѨ?{Y¶!¹ IEND®B`
\ No newline at end of file
Property changes on: sandbox/mapgears/geoext.ux/ux/WMSBrowser/resources/images/information.png
___________________________________________________________________
Name: svn:executable
+ *
More information about the Commits
mailing list