Skip to content
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

WebGL Implementation of main plotting interface in Grapher. #223

Merged
merged 38 commits into from
Jul 15, 2016
Merged

WebGL Implementation of main plotting interface in Grapher. #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f57c4d2
Added THREE.js and typings.
adamcw Jun 27, 2016
9ee7051
Merged master
adamcw Jul 11, 2016
39ff547
Fixed color bar when plot resizes
adamcw Jul 11, 2016
7033257
Moved all sizing code from initialization into just resize
adamcw Jul 11, 2016
8024f82
Code cleanup
adamcw Jul 11, 2016
e795ebb
Fixed limits to prevent zoom reset when changing 2D modes
adamcw Jul 11, 2016
245c8da
Fixed errors when rendering 1D plots due to no zAxis
adamcw Jul 11, 2016
fcfb30a
Removed extraneous paramter to redrawScene and restored public status
adamcw Jul 11, 2016
9c47a06
Changed all this calls to p inside initializeSVGPlot for consistency
adamcw Jul 11, 2016
0ed4446
Removed dotScaleSize as it was added to allow a scaling UI, but this …
adamcw Jul 11, 2016
77a6fe4
Put extraneous space back into gulpfile to avoid touching more files …
adamcw Jul 11, 2016
19b0d39
Converted numVertices to actually be a number of vertices, rather tha…
adamcw Jul 11, 2016
0f1aa1a
Clarifying comments
adamcw Jul 11, 2016
8dad16b
Fixed mistakes
adamcw Jul 12, 2016
a5e2f15
Response to comments.
adamcw Jul 12, 2016
0a1e75c
Fixed encapsulation of the resetZoom function separating UI and inter…
adamcw Jul 12, 2016
e0a5efc
Cleaned up long lines and switch statements
adamcw Jul 12, 2016
3d3ea44
Refactored zoom loop to occur inside the render loop
adamcw Jul 12, 2016
a4c7059
Reordered projection functions to flow a little better
adamcw Jul 12, 2016
0493e17
Added void return types, renamed zoomRectangle
adamcw Jul 12, 2016
315b1d8
More voids
adamcw Jul 12, 2016
c719e32
Use getAttribute instead of attributes
adamcw Jul 12, 2016
887f576
Better commented on the attributes for plotting in 1D and 2D
adamcw Jul 12, 2016
2ad3568
Fix graph resizing issues when lots of data points are available
adamcw Jul 13, 2016
e7ca055
Fix positioning of RectFill point
adamcw Jul 13, 2016
ef188f7
Fix issue with 1D plots becoming offset
adamcw Jul 13, 2016
51118a7
Replace broken and horrible Point sizing code with a working and much…
adamcw Jul 13, 2016
699174d
Fixed zoomRectangle
adamcw Jul 14, 2016
9953786
Fix no zoom reset when a scroll has occurred
adamcw Jul 14, 2016
8b19c33
Fix color scaling to update every frame rather than being fixed.
adamcw Jul 14, 2016
6ef83d0
Merged Master
adamcw Jul 14, 2016
e030599
Moved various functions into the render loop for efficiency, amongst …
adamcw Jul 14, 2016
ea8e66b
Properly defer graph projection when resizing a plot
adamcw Jul 14, 2016
50fe660
Removed plotID used for debug
adamcw Jul 15, 2016
b49c5f1
Merge branch 'master' into 185-graphing-performance-webgl
Jul 15, 2016
b633e94
Merge branch 'master' into 185-graphing-performance-webgl
Jul 15, 2016
e119b9e
Updated labrad-plot to use new ES6 import for THREEjs
Jul 15, 2016
4b4f684
Get THREE js to import and compile nicely
adamcw Jul 15, 2016
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
22 changes: 20 additions & 2 deletions client-js/app/elements/labrad-plot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,32 @@
#dots {
margin-top: 40px;
}
#plot {
position: relative;
}
#canvas {
position: absolute;
top: 0;
left: 0;
}
#zoomRectangle {
background-color: #eee;
opacity: 0.5;
cursor: crosshair;
position: absolute;
border: 2px solid #f00;
display: none;
}
</style>
<template>
<div id="plot"></div>
<div id="pos">current position: <span>{{currPos}}</span></div>
<div id="canvas"></div>
<div id="zoomRectangle"></div>
<div id="pos">Current Position: <span>{{currPos}}</span></div>
<div id="buttons">
<paper-icon-button icon="tab-unselected" id="rect" on-click="mouseModeSelectorZoomRect" title="drag to zoom"></paper-icon-button>
<paper-icon-button icon="open-with" id="pan" on-click="mouseModeSelectorPan" title="drag to pan"></paper-icon-button>
<paper-icon-button icon="home" id="home" on-click="resetZoom" title="zoom out"></paper-icon-button>
<paper-icon-button icon="home" id="home" on-click="resetZoomControl" title="zoom out"></paper-icon-button>
<paper-icon-button icon="list" id="select" on-click="traceSelectorOpen" title="select trace"></paper-icon-button>
<div id="modes2d">
<paper-icon-button icon="av:stop" id="dots" on-click="drawMode2DSelectorDots" title="draw with dots"></paper-icon-button>
Expand Down
Loading