Skip to content

added support for integrating selected data with plotly #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atitus wants to merge 5 commits into
base: master
Choose a base branch
from
Open

added support for integrating selected data with plotly #34

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7827a9b
added support for integrating selected data with plotly
Jan 1, 2020
e46448e
added graph bind function
Jan 4, 2020
a4fc667
fixed graph event
Jan 4, 2020
2115928
removed integrate_selected
Jan 31, 2020
78f6d83
built new glow.min.js with no integrate_selected; reverted to working…
Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed graph event
  • Loading branch information
Aaron Titus
Aaron Titus committed Jan 4, 2020
commit a4fc667af35b7a90956d164f005ad4e27b607fd1
55 changes: 28 additions & 27 deletions build_original_no_overload.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,36 @@
##shader_file = "\n".join(shader_file)
##open("lib/glow/shaders.gen.js", "wb").write(shader_file)

version = "2.8"
version = "2.9"
# TODO: Extract this information from run.js

glowscript_libraries = {
"run": [
"../lib/jquery/"+"2.1"+"/jquery.mousewheel.js", # use 2.1 lib with later versions
"../lib/flot/jquery.flot.js",
"../lib/flot/jquery.flot.crosshair_GS.js",
"../lib/opentype/poly2tri.js",
"../lib/opentype/opentype.js",
"../lib/glMatrix.js",
"../lib/webgl-utils.js",
"../lib/glow/property.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/jquery/"+"2.1"+"/jquery.mousewheel.js", # use 2.1 lib with later versions
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/flot/jquery.flot.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/flot/jquery.flot.crosshair_GS.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/opentype/poly2tri.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/opentype/opentype.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glMatrix.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/webgl-utils.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/property.js",
## "../lib/glow/vectors.js",
"../lib/glow/vectors_no_overload.js", # glowcomm doesn't need or want overloading
"../lib/glow/mesh.js",
"../lib/glow/canvas.js",
"../lib/glow/orbital_camera.js",
"../lib/glow/autoscale.js",
"../lib/glow/WebGLRenderer.js",
"../lib/glow/graph.js",
"../lib/glow/color.js",
"../lib/glow/shapespaths.js",
"../lib/glow/primitives.js",
"../lib/glow/api_misc.js",
"../lib/glow/extrude.js",
"../lib/glow/shaders.gen.js"
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/vectors_no_overload.js", # glowcomm doesn't need or want overloading
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/mesh.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/canvas.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/orbital_camera.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/autoscale.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/WebGLRenderer.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/graph.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/color.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/shapespaths.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/primitives.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/api_misc.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/extrude.js",
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/glow/shaders.gen.js"
],
"plotly": [
"../lib/plotly.js"
"/Users/atitus/Developer/glowscript-fork/glowscript/lib/plotly.js"
]
}

Expand All @@ -79,14 +79,15 @@ def combine(inlibs):
return "\n".join(all)

env = os.environ.copy()
env["NODE_PATH"] = "build-tools/UglifyJS"
env["NODE_PATH"] = "/Users/atitus/Developer/glowscript-fork/glowscript/build-tools"

def minify(inlibs, inlibs_nomin, outlib):
all = combine(inlibs)
outf = open(outlib, "wb")

if True: # minify if True
uglify = subprocess.Popen( "build-tools/node.exe build-tools/Uglify-ES/uglify-es/bin/uglifyjs",
# uglify = subprocess.Popen( "build-tools/node.exe build-tools/Uglify-ES/uglify-es/bin/uglifyjs",
uglify = subprocess.Popen( "/Users/atitus/Developer/glowscript-fork/glowscript/build-tools/node /Users/atitus/Developer/glowscript-fork/glowscript/build-tools/Uglify-ES/uglify-es/bin/uglifyjs",
stdin=subprocess.PIPE,
stdout=outf,
stderr=outf, # write uglify errors into output file
Expand All @@ -101,8 +102,8 @@ def minify(inlibs, inlibs_nomin, outlib):
outf.write( combine(inlibs_nomin) )
outf.close()

minify( glowscript_libraries["run"], [], "ForInstalledPython/glow.min.js" )
minify( glowscript_libraries["run"], [], "/Users/atitus/Developer/glowscript-fork/glowscript/ForInstalledPython/glow.min.js" )
print('Finished glow run-time package\n')
minify( glowscript_libraries["plotly"], [], "ForInstalledPython/plotly.min.js" )
minify( glowscript_libraries["plotly"], [], "/Users/atitus/Developer/glowscript-fork/glowscript/ForInstalledPython/plotly.min.js" )
print('Finished glow run-time package\n')

6 changes: 3 additions & 3 deletions lib/glow/graph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,12 @@
this.events.push([eventTypes, callback])
},
trigger: async function( type, evarg ) {
var ev = {type:type, x:evarg.x, y:evarg.y}

var ev = {type:type, event:evarg}
console.log(ev)
for (var i=0; i<this.events.length; i++) {
// this.events element is ['dataselected etc.', bound function]
if (this.events[i][0] == 'dataselected') {
(await this.events[i][1])(ev.x,ev.y) // call the bound function
(await this.events[i][1])(ev) // call the bound function
}
}
},
Expand Down
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,9 @@
"gulp-tap": "^0.1.3",
"gulp-uglify": "^1.2.0",
"gulp-wrap": "^0.11.0"
},
"dependencies": {
"commander": "^4.0.1",
"source-map": "^0.7.3"
}
}