1832 Commits

Author SHA1 Message Date
Shivam Dave
50d10639e1 [Mobile] Clean Up
Changed variable placement
for amount of distance changed allowed
for a pinch drag.
2015-09-02 09:23:25 -07:00
Shivam Dave
5a9619ce26 [Mobile] Clean Up
Removed unneeded variables passed into
MCTPlot functions.
2015-09-02 09:16:01 -07:00
Shivam Dave
42b7427816 [Mobile] Clean up
Renamed the setDR to be set
Dimensions. Also removed unneeded
calculateDistance function.
2015-09-02 09:14:54 -07:00
Shivam Dave
a1b37b1269 [Mobile] Clean Up
Added comments and cleaned up a bit
of the MCTPinch file.
2015-09-02 09:13:28 -07:00
Shivam Dave
c8ca1deb9b [Mobile] Gestures
Fixed the range of values for
differentiating between pan and
pinch zoom to not assign the +2/-2
value to the variable.
2015-09-01 12:15:48 -07:00
Shivam Dave
5be6e90388 [Mobile] Clean Up
Commented out console calls from gesture
pinch/plot classes. Also allowed pan with
single finger.
2015-09-01 11:53:41 -07:00
Shivam Dave
814b04858a [Mobile] Gestures
MCTPinch adjusted the touch check to help
differentiate between a two finger touch
vs a single singer pan.
2015-09-01 11:45:11 -07:00
Shivam Dave
aedbd3bd9b [Mobile] Gestures
ZOOM_AMT set back to original
0.02, because .025 made zoom out
too fast.
2015-09-01 10:45:02 -07:00
Shivam Dave
aa4dbf7062 [Mobile] Gestures
Ratio used to check if
zoom should be in or out now
divides lastDistance/distance
instead of firstDistance/distance.
Therefore by comparing last distance,
user is able to zoom in and out on
same pinch without removing fingers.
2015-09-01 10:24:32 -07:00
Shivam Dave
5b95574673 [Mobile] Gestures
Slight adjustment to the ZOOM_AMT,
increased by .005 from .02 to .025.
2015-09-01 10:22:02 -07:00
Shivam Dave
2295be5e35 [Mobile] Gestures
Set the range of difference allowed between
the last distance and current distance to
differenciate panning and zooming. If
lastDistance - 2 <= currentDistance <= lastDistance + 2
than panning occurs, otherwise user is zooming.
BUG: The auto snap to right side of chart causes the
chart to resize narrower overtime and as user BOTH
zooms and pans more.
2015-09-01 10:17:53 -07:00
Shivam Dave
0ac6caa823 [Mobile] Gestures
Added a zoom amount variable
that is set at top of MCTPlot.
Sets the amount of zoom multiplier.
2015-09-01 10:14:51 -07:00
Shivam Dave
5e1dd04e6d [Mobile] Pinch & Pan
Adjusted Pinch to check if
distance between 2 fingers
(rounded to whole number) is equal to
last distance or first distance, if this
is true, than will pan otherwise do
pinch zoom.
2015-08-31 16:25:44 -07:00
Shivam Dave
29df378851 [Mobile] Gestures
Removed firstTouchPan and use
firstTouch for both the pinch and the
single touch pan.
2015-08-31 16:22:43 -07:00
Shivam Dave
8511c957a0 [Mobile] Gestures
Adjusted the 0.03 'multiplier'
from 0.01, to allow faster zooming in
and out.
2015-08-31 15:48:11 -07:00
Shivam Dave
f4efc79539 [Mobile] Clean up
Removed call to console.
2015-08-31 15:47:19 -07:00
Shivam Dave
3926d6f617 [Mobile] Gesture
Zooms in at 0.01 amount (like last commit)
however the pinch's midpoint is the center
point at which the zoom focuses on.
2015-08-31 15:33:33 -07:00
Shivam Dave
d65e0f820f [Mobile] Gestures
Currently zooms into center by narrowing each
dimension by 0.01
2015-08-31 14:47:02 -07:00
Shivam Dave
24fe419be4 [Mobile] Gestures
Slight clean up to MCTPinch.
2015-08-31 13:01:15 -07:00
Shivam Dave
3e2c3f913b [Mobile] Gesture Check
Commented out panand trackes current 2
touches on pinch.
2015-08-28 16:48:54 -07:00
Shivam Dave
a45b09277e [Mobile} Pan/Pinch
Cleaned up the variables.
2015-08-28 16:01:00 -07:00
Shivam Dave
bdf3e4d8a3 [Mobile] Pan/Pinch
On destoying the scope of
MCTPinch, all the listeners for
touch events on the element are
destroyed.
2015-08-28 15:39:16 -07:00
Shivam Dave
e4a2904213 [Mobile] Pan Gesture
Added pan gesture functionality
with one finger to MCTPlot.
2015-08-28 15:23:19 -07:00
Shivam Dave
f1d4e36c02 [Mobile] Gestures
Added an endTouch/Zoom to the
MCTPlot to mark when the user
has canceled/ended their touch
event.
2015-08-28 15:22:15 -07:00
Shivam Dave
b3792c21be [Mobile] Gestures
Adjusted MCTPinch names to work
for both pan and pinch.
2015-08-28 15:20:46 -07:00
Shivam Dave
1fbbf355f4 [Mobile Gestures] Pan
Adds pan gesture to plots. Sets up the
zoom gesture addition. Also the back button
is visible on desktop versions.
2015-08-20 11:26:09 -07:00
Shivam Dave
9fec73da14 Merge remote-tracking branch 'upstream/plot-vee-two' into mobile_gestures_1 2015-08-17 13:20:02 -07:00
Shivam Dave
23048f0df9 [Mobile Gestures] Comments
Added comments to pinch functions.
2015-08-17 13:15:46 -07:00
Shivam Dave
dfe3409a98 [Mobile, Gestures] Pinch
Split the pinch gesture into start,
change, and end/cancel. Each of those
are read in and then they emit through
the scope to functions in the controller.
2015-08-17 13:12:53 -07:00
Shivam Dave
5c3fe78bd5 [Mobile, Gestures] Pinch
Moved MCTPinch directive into
plot-reborn. Now emits on pinch action
the event to the controller. Edited plot.html
to clean up and edited mct-plot.html to
include mct-pinch. DrawLoader adjusted to
allow  and prevent error.
2015-08-17 12:51:33 -07:00
Pete Richards
eb69e02ce3 [Plot] Reset telemetry objects on change 2015-08-17 12:39:38 -07:00
Shivam Dave
17e2da2d2c Merge remote-tracking branch 'upstream/plot-vee-two' into mobile_gestures_1 2015-08-17 10:53:54 -07:00
Shivam Dave
03db1b3623 Merge remote-tracking branch 'upstream/master' into mobile_3 2015-08-17 10:51:28 -07:00
Shivam Dave
5c23daa5ff [Mobile, Gestures] Pinch
Pinch directive commited with removal
of gestures. Added connection to controller
and plot application on html file.
2015-08-17 10:49:11 -07:00
Victor Woeltjen
83fce6ad77 [Search] Remove unused dependency
Remove unused dependency from generic search worker,
avoids WTD-1511.
2015-08-17 10:45:02 -07:00
Pete Richards
056b3f61ce [Style] JSLint Compliance 2015-08-14 11:54:46 -07:00
Pete Richards
a0dc3da8fb [Plot] Use ColorService for plot colors 2015-08-13 16:07:08 -07:00
Pete Richards
48f345a46b [Service] ColorPalette is now ColorService 2015-08-13 16:06:26 -07:00
Shivam Dave
2cf7f6794c Merge remote-tracking branch 'upstream/master' into mobile_3 2015-08-13 09:14:28 -07:00
Victor Woeltjen
8371b1b25b Merge pull request #59 from slhale/searchservice
[Search] Created search service
2015-08-12 17:05:50 -07:00
Pete Richards
889a5c6ea9 Allow duplicates in repeats, use proper labels 2015-08-12 16:50:51 -07:00
Pete Richards
5502009127 Reasonable defaults for directive scope 2015-08-12 16:50:09 -07:00
Pete Richards
cb41be7922 Plot uses ColorPalette to allocate colors 2015-08-12 16:27:28 -07:00
Shivam Dave
2997f2a261 [Mobile, Gestures] Removed Gesutres
Removed gesture info from bundles,
switching to using directives for
pinch.
2015-08-12 16:22:04 -07:00
Pete Richards
52b8720d37 ColorPalette dispenses colors. 2015-08-12 16:17:20 -07:00
Pete Richards
bb8c8a75ab MCTChart preserves precision of plot values 2015-08-12 13:59:32 -07:00
slhale
94531a39d0 Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice 2015-08-12 13:17:17 -07:00
Victor Woeltjen
3db62edf59 Merge remote-tracking branch 'github/master' into open-master
Conflicts:
	README.md
2015-08-12 12:19:53 -07:00
Victor Woeltjen
914c823675 [Tests] Comment out failing tests
Comment out tests which relate to object types not
yet in open source, WTD-1505
2015-08-12 11:57:56 -07:00
slhale
cab675c8ca [Search] Timeout length & indexed check
Changed timeout to 0 ms. Changed check for
already indexed to an empty return.
2015-08-12 10:57:37 -07:00