Commits

Matthew Turk committed c38c0ac

Fixing data object payload delivery

Comments (0)

Files changed (4)

yt/gui/reason/extdirect_repl.py

 from .bottle_mods import preroute, BottleDirectRouter, notify_route, \
                          PayloadHandler, lockit
 from yt.utilities.bottle import response, request, route, static_file
+from .utils import get_list_of_datasets
 from .basic_repl import ProgrammaticREPL
 
 try:
                  'input': highlighter(code),
                  'raw_input': code},
                 )
+        objs = get_list_of_datasets()
+        self.repl.payload_handler.add_payload(
+            {'type': 'dataobjects',
+             'objs': objs})
 
 class PyroExecutionThread(ExecutionThread):
     def __init__(self, repl):

yt/gui/reason/html/app/controller/Notebook.js

     allowInput: function() {
         this.getInputLine().removeCls("cell_waiting");
         this.getInputLine().setReadOnly(false);
-        console.log("Calling FileList");
         var application = this.application;
     },
 

yt/gui/reason/html/app/controller/ServerCommunication.js

     heartbeatCall: function() {
         if (heartbeatRequest == true) return;
         heartbeatRequest = true;
-        console.log("Sending heartbeat");
+        /*console.log("Sending heartbeat");*/
         yt_rpc.ExtDirectREPL.heartbeat(
             {}, function(f, a) {
                 heartbeatRequest = false;

yt/gui/reason/pyro_queue.py

         code = self.comm.comm.bcast(code, root=0)
         value = self.repl.execute(code)
         datasets = get_list_of_datasets()
-        self.payload_handler.add_payload({'type': 'payloaddataobjects',
+        self.payload_handler.add_payload({'type': 'dataobjects',
                                           'objs': datasets})
         return value