[Yt-svn] commit/yt: 3 new changesets
Bitbucket
commits-noreply at bitbucket.org
Sat Apr 2 20:48:37 PDT 2011
3 new changesets in yt:
http://bitbucket.org/yt_analysis/yt/changeset/9df3c4d170bf/
changeset: r4061:9df3c4d170bf
branch: yt
user: MatthewTurk
date: 2011-04-03 03:36:15
summary: Adding 'type' to objdata and consolidated 'data' and 'objects' in the UI
affected #: 2 files (82 bytes)
--- a/yt/gui/reason/html/js/functions.js Fri Apr 01 13:06:30 2011 -0400
+++ b/yt/gui/reason/html/js/functions.js Sat Apr 02 21:36:15 2011 -0400
@@ -107,7 +107,7 @@
Ext.each(my_pfs, function(pf, index) {
treePanel.root.appendChild(new Ext.tree.TreeNode({
text: pf.name,
- objdata: {fn: pf.filename, varname: pf.varname},
+ objdata: {fn: pf.filename, varname: pf.varname, type: 'pf'},
leaf:false,
expanded:true,
iconCls: 'pf_icon'}));
@@ -117,7 +117,7 @@
{text: obj.name,
leaf: true,
iconCls: 'data_obj',
- objdata: {varname: obj.varname},
+ objdata: {varname: obj.varname, type: 'obj'},
}));
});
});
--- a/yt/gui/reason/html/js/reason.js Fri Apr 01 13:06:30 2011 -0400
+++ b/yt/gui/reason/html/js/reason.js Sat Apr 02 21:36:15 2011 -0400
@@ -161,7 +161,6 @@
var treePanel = new Ext.tree.TreePanel({
iconCls: 'nav',
id: 'tree-panel',
- title: 'Objects',
layout: 'anchor',
region:'west',
split: true,
@@ -185,6 +184,7 @@
},
contextmenu: {
fn: function(node, event){
+ if (node.attributes.objdata.type == 'obj') return;
var rightClickMenu = new Ext.menu.Menu({
items: [
{
@@ -329,7 +329,7 @@
}, {
region: 'west',
id: 'west-panel', // see Ext.getCmp() below
- title: 'Data',
+ title: 'Data Objects',
split: true,
width: 200,
minSize: 175,
http://bitbucket.org/yt_analysis/yt/changeset/9727c02956e6/
changeset: r4062:9727c02956e6
branch: yt
user: MatthewTurk
date: 2011-04-03 04:01:05
summary: Adding field list to slice and projection selection window
affected #: 2 files (359 bytes)
--- a/yt/gui/reason/extdirect_repl.py Sat Apr 02 21:36:15 2011 -0400
+++ b/yt/gui/reason/extdirect_repl.py Sat Apr 02 22:01:05 2011 -0400
@@ -279,11 +279,16 @@
api_url = "pflist"
def get_list_of_pfs(self):
+ # Note that this instantiates the hierarchy. This can be a costly
+ # event. However, we're going to assume that it's okay, if you have
+ # decided to load up the parameter file.
from yt.data_objects.static_output import _cached_pfs
rv = []
for fn, pf in sorted(_cached_pfs.items()):
objs = []
pf_varname = "_cached_pfs['%s']" % (fn)
+ fields = pf.h.field_list + pf.h.derived_field_list
+ fields.sort()
for i,obj in enumerate(pf.h.objects):
try:
name = str(obj)
@@ -292,7 +297,7 @@
objs.append(dict(name=name, type=obj._type_name,
varname = "%s.h.objects[%s]" % (pf_varname, i)))
rv.append( dict(name = str(pf), objects = objs, filename=fn,
- varname = pf_varname) )
+ varname = pf_varname, field_list = fields) )
return rv
def ext_load_script(filename):
--- a/yt/gui/reason/html/js/functions.js Sat Apr 02 21:36:15 2011 -0400
+++ b/yt/gui/reason/html/js/functions.js Sat Apr 02 22:01:05 2011 -0400
@@ -107,7 +107,8 @@
Ext.each(my_pfs, function(pf, index) {
treePanel.root.appendChild(new Ext.tree.TreeNode({
text: pf.name,
- objdata: {fn: pf.filename, varname: pf.varname, type: 'pf'},
+ objdata: {fn: pf.filename, varname: pf.varname, type: 'pf',
+ field_list: pf.field_list},
leaf:false,
expanded:true,
iconCls: 'pf_icon'}));
@@ -194,7 +195,7 @@
xtype:'combo',
fieldLabel: 'Field',
id: 'slice_field',
- store:['Density','Temperature','X Velocity','Y Velocity','Z Velocity'],
+ store:node.attributes.objdata.field_list,
width: 90,
allowBlank:false,
}],
@@ -260,14 +261,14 @@
xtype:'combo',
fieldLabel: 'Field',
id: 'field',
- store:['Density','Temperature','X Velocity','Y Velocity','Z Velocity'],
+ store:node.attributes.objdata.field_list,
width: 120,
allowBlank:false,
},{
xtype:'combo',
fieldLabel: 'Weight Field',
id: 'weightField',
- store:['None','Density','Temperature','X Velocity','Y Velocity','Z Velocity'],
+ store:node.attributes.objdata.field_list,
width: 120,
allowBlank:false,
}],
http://bitbucket.org/yt_analysis/yt/changeset/a9d5af3b2602/
changeset: r4063:a9d5af3b2602
branch: yt
user: MatthewTurk
date: 2011-04-03 05:48:24
summary: Widening the windows for slicing and projecting
affected #: 1 file (1 byte)
--- a/yt/gui/reason/html/js/functions.js Sat Apr 02 22:01:05 2011 -0400
+++ b/yt/gui/reason/html/js/functions.js Sat Apr 02 23:48:24 2011 -0400
@@ -152,7 +152,7 @@
function sliceHandler(item,pressed){
var win = new Ext.Window({
layout:'fit',
- width:240,
+ width:320,
height:200,
modal:true,
resizable:false,
@@ -196,7 +196,7 @@
fieldLabel: 'Field',
id: 'slice_field',
store:node.attributes.objdata.field_list,
- width: 90,
+ width: 200,
allowBlank:false,
}],
buttons: [
@@ -239,7 +239,7 @@
function projectionHandler(item,pressed){
var win = new Ext.Window({
layout:'fit',
- width:240,
+ width:370,
height:170,
modal:true,
resizable:false,
@@ -262,14 +262,14 @@
fieldLabel: 'Field',
id: 'field',
store:node.attributes.objdata.field_list,
- width: 120,
+ width: 230,
allowBlank:false,
},{
xtype:'combo',
fieldLabel: 'Weight Field',
id: 'weightField',
store:node.attributes.objdata.field_list,
- width: 120,
+ width: 230,
allowBlank:false,
}],
buttons: [
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list