Merge pull request #146 from vidartf/fix-jlab

Update jlab plugin on master

Author: vidartf

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyter-threejs",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "jupyter - threejs bridge",
   "author": "Jupyter-Threejs development team",
   "license": "BSD-3-Clause",
@@ -32,5 +32,8 @@
     "jupyter-dataserializers": "^1.0.0",
     "three": "^0.88.0",
     "underscore": "^1.8.3"
+  },
+  "jupyterlab": {
+    "extension": "src/jupyterlab-plugin"
   }
 }

js/src/_base/Preview.js

@@ -58,7 +58,7 @@ var PreviewView = RenderableView.extend({
 
         if (obj.isObject3D) {
 
-            this.log('render Object3D');
+            this.debug('render Object3D');
             // Use a clone to not change `parent` attribute
             this.scene.add(obj.clone());
 
@@ -161,7 +161,7 @@ var PreviewView = RenderableView.extend({
 
     setupControls: function() {
         // Allow user to inspect object with mouse/scrollwheel
-        this.log('setting up controls');
+        this.debug('setting up controls');
         var control = new OrbitControls(this.camera, this.renderer.domElement);
         control.target.set(0, 0, 0);
         control.update();
@@ -195,7 +195,7 @@ var PreviewView = RenderableView.extend({
     },
 
     renderScene: function() {
-        this.log('renderScene');
+        this.debug('renderScene');
 
         if (this.isFrozen) {
             this.unfreeze();

js/src/_base/Renderable.js

@@ -83,7 +83,7 @@ var RenderableModel = widgets.DOMWidgetModel.extend({
     },
 
     onChildChanged: function(model, options) {
-        console.log('child changed: ' + model.model_id);
+        console.debug('child changed: ' + model.model_id);
         // Let listeners (e.g. views) know:
         this.trigger('childchange', this);
     },
@@ -238,7 +238,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
     },
 
     renderScene: function(scene, camera) {
-        this.log('renderScene');
+        this.debug('renderScene');
 
         scene = scene || this.scene;
         camera = camera || this.camera;
@@ -266,7 +266,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
         if (!this.isFrozen) {
             return;
         }
-        this.log('unfreeze');
+        this.debug('unfreeze');
 
         this.isFrozen = false;
 
@@ -284,7 +284,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
 
     acquireRenderer: function() {
 
-        this.log('ThreeView.acquiring...');
+        this.debug('ThreeView.acquiring...');
 
         var config = {
             antialias: this.model.get('_antialias'),
@@ -300,7 +300,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
 
         this.updateSize();
 
-        this.log('ThreeView.acquireRenderer(' + this.renderer.poolId + ')');
+        this.debug('ThreeView.acquireRenderer(' + this.renderer.poolId + ')');
     },
 
     freeze: function() {
@@ -309,7 +309,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
             return;
         }
 
-        this.log('ThreeView.freeze(id=' + this.renderer.poolId + ')');
+        this.debug('ThreeView.freeze(id=' + this.renderer.poolId + ')');
 
         this.$el.empty().append('<img src="' + this.renderer.domElement.toDataURL() + '" />');
 
@@ -321,7 +321,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
 
         if (this.controls) {
             this.$frozenRenderer.on('mouseenter', _.bind(function() {
-                this.log('frozenRenderer.mouseenter');
+                this.debug('frozenRenderer.mouseenter');
                 this.tick(); // renderer will be acquired by renderScene
             }, this));
         }
@@ -348,7 +348,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
     },
 
     enableControls: function() {
-        this.log('Enable controls');
+        this.debug('Enable controls');
         var that = this;
         this.controls.forEach(function(control) {
             control.enabled = true;
@@ -358,7 +358,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
     },
 
     disableControls: function() {
-        this.log('Disable controls');
+        this.debug('Disable controls');
         var that = this;
         this.controls.forEach(function(control) {
             control.enabled = false;
@@ -377,7 +377,7 @@ var RenderableView = widgets.DOMWidgetView.extend({
     },
 
     onRendererReclaimed: function() {
-        this.log('ThreeView WebGL context is being reclaimed: ' + this.renderer.poolId);
+        this.debug('ThreeView WebGL context is being reclaimed: ' + this.renderer.poolId);
 
         this.freeze();
     },
@@ -386,6 +386,10 @@ var RenderableView = widgets.DOMWidgetView.extend({
         console.log('TV(' + this.id + '): ' + str);
     },
 
+    debug: function(str) {
+        console.debug('TV(' + this.id + '): ' + str);
+    },
+
     lazyRendererSetup: function() {
         throw new Error('RenderableView should not be used directly, please subclass!');
     }

js/src/_base/RendererPool.js

@@ -92,7 +92,7 @@ _.extend(RendererPool.prototype, {
     acquire: function(config, onReclaim) {
 
         var renderer;
-        console.log('RendererPool.acquiring...');
+        console.debug('RendererPool.acquiring...');
 
         if (this.freePool.length > 0) {
 
@@ -131,14 +131,14 @@ _.extend(RendererPool.prototype, {
 
         // Ensure aliasing state matches, or remake
 
-        console.log('RendererPool.acquire(id=' + renderer.poolId + ')');
+        console.debug('RendererPool.acquire(id=' + renderer.poolId + ')');
         this.claimedPool.push(config, makeRendererClaimToken(renderer, onReclaim));
         renderer.clear();
         return renderer;
     },
 
     release: function(renderer) {
-        console.log('RendererPool.release(id=' + renderer.poolId + ')');
+        console.debug('RendererPool.release(id=' + renderer.poolId + ')');
 
         var id = renderer.poolId;
         var kvPair = this.claimedPool.popFind(function(claimToken) {

js/src/_base/Three.js

@@ -235,13 +235,12 @@ var ThreeModel = widgets.WidgetModel.extend({
             console.log('SERVER: ' + JSON.stringify(content.msg));
             break;
         default:
-            console.log('ERROR: invalid custom message');
-            console.log(content);
+            console.error('ERROR: invalid custom message', content);
         }
     },
 
     onExecThreeObjMethod: function(methodName, args, buffers) {
-        console.log('execThreeObjMethod: ' + methodName +
+        console.debug('execThreeObjMethod: ' + methodName +
             '(' + args.map(JSON.stringify).join(',') + ')');
 
         if (!(methodName in this.obj)) {
@@ -292,7 +291,7 @@ var ThreeModel = widgets.WidgetModel.extend({
                     retVal = retVal.ipymodel;
                 }
 
-                console.log('sending return value to server...');
+                console.debug('sending return value to server...');
                 this.send({
                     type: 'exec_three_obj_method_retval',
                     method_name: methodName,
@@ -317,7 +316,7 @@ var ThreeModel = widgets.WidgetModel.extend({
     },
 
     onChildChanged: function(model) {
-        console.log('child changed: ' + model.model_id);
+        console.debug('child changed: ' + model.model_id);
         // Propagate up hierarchy:
         this.trigger('childchange', this);
     },

js/src/jupyterlab-plugin.js

@@ -0,0 +1,16 @@
+var jupyter_threejs = require('./index');
+
+var base = require('@jupyter-widgets/base');
+
+module.exports = {
+    id: 'jupyter.extensions.jupyter-threejs',
+    requires: [base.IJupyterWidgetRegistry],
+    activate: function(app, widgets) {
+        widgets.registerWidget({
+            name: 'jupyter-threejs',
+            version: jupyter_threejs.version,
+            exports: jupyter_threejs
+        });
+    },
+    autoStart: true
+};

js/src/textures/ImageTexture.js

@@ -16,7 +16,7 @@ var ImageTextureModel = ImageTextureBase.ImageTextureModel.extend({
                     return resolve(texture);
                 },
                 function(xhr) {
-                    console.log(imageUri + ': ' + (xhr.loaded / xhr.total * 100) + '%');
+                    console.debug(imageUri + ': ' + (xhr.loaded / xhr.total * 100) + '%');
                 },
                 function(xhr) {
                     console.log('Error loading texture: ' + imageUri);

jslab/lib/index.js

@@ -5,4 +5,4 @@
 __version__ = '%s.%s.%s%s'%(version_info[0], version_info[1], version_info[2],
           '' if version_info[3]=='final' else _specifier_[version_info[3]]+str(version_info[4]))
 
-EXTENSION_VERSION = '0.4.0'
+EXTENSION_VERSION = '0.4.1'