mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Status monitoring added to notebook.

Browse Source 
* Busy == red
* Idle == gray
* Restarting == black
This commit is contained in:
Brian Granger 2011-04-27 12:22:01 -07:00 committed by Brian E. Granger
parent 06a6f1b145
commit a5c3132665
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
IPython/frontend/html/notebook/static/css/notebook.css
View File

@ -85,6 +85,25 @@ div#toolbar {
padding: 5px;
}
span#kernel_status {
position: absolute;
top: 12%;
right: 10px;
font-weight: bold;
}
.status_idle {
color: gray;
}
.status_busy {
color: red;
}
.status_restarting {
color: black;
}
div.notebook {
width: 790px;
height: 650px; /*We might have to detect window height for this*/

33
IPython/frontend/html/notebook/static/js/notebook.js
View File

@ -102,7 +102,7 @@ var Notebook = function (selector) {
Notebook.prototype.bind_events = function () {
var that = this;
$(document).keydown(function (event) {
console.log(event);
// console.log(event);
if (event.which == 38 && event.shiftKey) {
event.preventDefault();
that.select_prev();
@ -458,6 +458,12 @@ Notebook.prototype._kernel_started = function () {
} else if (msg_type === "pyout" || msg_type === "display_data") {
cell.expand();
cell.append_display_data(reply.content.data);
} else if (msg_type === "status") {
if (reply.content.execution_state === "busy") {
that.kernel.status_busy();
} else if (reply.content.execution_state === "idle") {
that.kernel.status_idle();
};
};
};
};
@ -769,16 +775,40 @@ Kernel.prototype.interrupt = function () {
Kernel.prototype.restart = function () {
this.status_restarting();
url = this.kernel_url + "/restart"
var that = this;
$.post(url, function (kernel_id) {
console.log("Kernel restarted: " + kernel_id);
that.kernel_id = kernel_id;
that.kernel_url = that.base_url + "/" + that.kernel_id;
that.status_idle();
}, 'json');
};
Kernel.prototype.status_busy = function () {
$("#kernel_status").removeClass("status_idle");
$("#kernel_status").removeClass("status_restarting");
$("#kernel_status").addClass("status_busy");
$("#kernel_status").text("Busy");
};
Kernel.prototype.status_idle = function () {
$("#kernel_status").removeClass("status_busy");
$("#kernel_status").removeClass("status_restarting");
$("#kernel_status").addClass("status_idle");
$("#kernel_status").text("Idle");
};
Kernel.prototype.status_restarting = function () {
$("#kernel_status").removeClass("status_busy");
$("#kernel_status").removeClass("status_idle");
$("#kernel_status").addClass("status_restarting");
$("#kernel_status").text("Restarting");
};
//============================================================================
// On document ready
//============================================================================
@ -803,6 +833,7 @@ $(document).ready(function () {
$("#kernel_toolbar").buttonset();
$("#interrupt_kernel").click(function () {IPYTHON.notebook.kernel.interrupt();});
$("#restart_kernel").click(function () {IPYTHON.notebook.kernel.restart();});
$("#kernel_status").addClass("status_idle");
$("#move_cell").buttonset();
$("#move_up").button("option", "icons", {primary:"ui-icon-arrowthick-1-n"});

1
IPython/frontend/html/notebook/templates/notebook.html
View File

@ -26,6 +26,7 @@
<div id="tools">
<div id="menu_tabs">
<span id="kernel_status">Idle</span>
<ul>
<li><a href="#cell_tab">Cell</a></li>
<li><a href="#kernel_tab">Kernel</a></li>