fix 3dmap
authorAnthony Garcia <anthony.garcia@inria.fr>
Fri, 27 Sep 2013 09:34:56 +0000 (11:34 +0200)
committerAnthony Garcia <anthony.garcia@inria.fr>
Fri, 27 Sep 2013 09:34:56 +0000 (11:34 +0200)
plugins/senslabmap/static/js/senslabmap.js
plugins/senslabmap/static/js/viewer3D.js

index 68e2189..eb3acd2 100644 (file)
@@ -9,8 +9,6 @@
       this.received_set = false;
       this.in_set_buffer = Array();
       
-      this.el().on('show', this, this.on_show);
-      
       var query = manifold.query_store.find_analyzed_query(options.query_uuid);
       this.method = query.object;
       
index 1536921..1e596dc 100644 (file)
@@ -24,14 +24,13 @@ var nodes = [];
 function init() {\r
   var particles, particle;\r
   \r
-  div3d = JQuery('#div3d');\r
-  nodebox = JQuery('#nodebox');\r
-  infobox = JQuery('#infobox');\r
-  titlebox = JQuery('#titlebox');\r
+  div3d = document.getElementById('div3d');\r
+  nodebox = document.getElementById('nodebox');\r
+  infobox = document.getElementById('infobox');\r
+  titlebox = document.getElementById('titlebox');\r
   \r
-  var offset = div3d.offset;\r
-  offY = div3d.top;\r
-  offX = div3d.left;\r
+  offY = div3d.offsetTop;\r
+  offX = div3d.offsetLeft;\r
   \r
   //titlebox.innerHTML = 'Grenoble Site ' + nodes.length + " nodes";\r
   infobox.innerHTML = 'Node info : ';\r
@@ -44,7 +43,7 @@ function init() {
   \r
   renderer = new THREE.CanvasRenderer();\r
   \r
-  div3d.append(renderer.domElement);\r
+  div3d.appendChild(renderer.domElement);\r
   \r
   window.addEventListener('resize', set3dsize, false);\r
   scene.add(camera);\r
@@ -116,11 +115,10 @@ function init() {
 }\r
 \r
 function set3dsize() {\r
-  var offset = div3d.offset;\r
-  offY = offset.top;\r
-  offX = offset.left;\r
-  window3DWidth = offset.width;\r
-  window3DHeight = offset.height;\r
+  offY = div3d.offsetTop;\r
+  offX = div3d.offsetLeft;\r
+  window3DWidth = div3d.offsetWidth;\r
+  window3DHeight = div3d.offsetHeight;\r
   renderer.setSize(window3DWidth, window3DHeight);\r
   \r
   camera.aspect = window3DWidth / window3DHeight;\r