ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-28 17:08:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,586 Commits 988 Branches 212 Tags 191 MiB
07140b179f
Commit Graph

1050 Commits

Author SHA1 Message Date
Henry
19fd63b850 Merge branch 'open933-frontend-b' into open933 2016-07-21 20:06:50 -07:00
Henry
c2c8e16453 Added scale sensitive formatting to UTCTimeFormat 2016-07-21 20:05:28 -07:00
Charles Hacskaylo
a10ded25b4 Merge remote-tracking branch 'origin/open933' into open933-frontend-b 
# Conflicts:
#	platform/features/conductor-v2/res/sass/time-conductor.scss
#	platform/features/conductor/res/sass/time-conductor.scss
 2016-07-20 18:33:58 -07:00
Charles Hacskaylo
da7c636724 [Frontend] Time Conductor v2 styling 
Fixes #933
Redo TC icon to use font symbol, added
new symbol for brackets to font files; font
anti-aliasing mod for .ui-symbol class;
layout tweaks; mobile tweaks.
 2016-07-20 18:22:20 -07:00
Charles Hacskaylo
b392633bc6 [Frontend] Time Conductor v2 styling 
Fixes #933
WIP: Significant mobile and desktop style tweaks;
moved constants into their own include file;
 2016-07-20 15:48:22 -07:00
Charles Hacskaylo
ff1678435e [Frontend] Time Conductor v2 styling 
Fixes #933
Changed desktop and mobile RT UI to display
end datetime and hide start;
WIP: mobile styling for main UI of TC;
 2016-07-20 11:43:40 -07:00
Charles Hacskaylo
2124fe01e1 [Frontend] Renew support for Time Conductor v1 
Fixes #933
Minor fixes to TCv1 for mobile
 2016-07-20 10:18:42 -07:00
Charles Hacskaylo
ea1defac28 [Frontend] Renew support for Time Conductor v1 
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
 2016-07-19 20:00:32 -07:00
Henry
2a19394334 Added compatibility layer to support existing plots and historical tables 2016-07-19 19:54:52 -07:00
Charles Hacskaylo
f641edbce7 [Frontend] Renew support for Time Conductor v1 
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
 2016-07-19 18:33:24 -07:00
Henry
15a608a861 Populate format in input fields 2016-07-18 18:44:29 -07:00
Henry
334ca64551 Merged open933-frontend 2016-07-18 14:25:02 -07:00
Henry
0af49efe06 Refactored out modes, time systems, etc. 2016-07-18 12:49:44 -07:00
Charles Hacskaylo
43a804eef4 [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Added zoom current range indicator;
tweaks to style
 2016-07-15 07:54:32 -07:00
Charles Hacskaylo
b3a4f52fe2 [Frontend] Styling for Time Conductor v2 
Fixes #933
WIP: Adding zoom control with HTML5
input range type; Refactored sass slightly
to move display: inline-block out of mixin
containerBase and into .s-btn.
 2016-07-14 18:30:49 -07:00
Henry
307b678707 [Fixed] Create new object type based on Telemetry Panel 'Fixed' view. Fixes #1075 2016-07-14 17:00:13 -07:00
Henry
2f9fbfef7f More refactoring 2016-07-13 20:33:47 -07:00
Henry
2baca659ca Refactoring 2016-07-13 19:50:58 -07:00
Charles Hacskaylo
e193e3dfba Merge open933 latest, resolve conflicts 
Fixes #933
Fair amount of manual fixing in time-conductor.html
 2016-07-13 19:16:27 -07:00
Charles Hacskaylo
8214c8e895 Merge open933 latest, resolve conflicts 
Fixes #933
Fair amount of manual fixing in time-conductor.html
 2016-07-13 19:16:00 -07:00
Charles Hacskaylo
33b2225d10 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
 2016-07-13 18:48:17 -07:00
Henry
14463d39a8 Added end delta 2016-07-13 18:17:27 -07:00
Charles Hacskaylo
06af84c161 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
 2016-07-13 13:14:32 -07:00
Henry
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
Henry
fd29473664 Support resize 2016-07-12 15:02:39 -07:00
Henry
97f3fd516b Changed default duration to fifteen minutes 2016-07-12 10:14:26 -07:00
Henry
088416905d Added duration 2016-07-12 10:08:08 -07:00
Henry
2056d87453 Merge branch 'open933-frontend' into open933 2016-07-11 14:27:30 -07:00
Henry
585da38a16 Fixed some merge issues 2016-07-11 13:46:46 -07:00
Charles Hacskaylo
bf0e85a94c [Frontend] Styling for Time Conductor v2 
Fixes #933
Renamed main class; removed unused <style>
defs
 2016-07-11 11:35:26 -07:00
Charles Hacskaylo
84b7a9dc2f Merge remote-tracking branch 'origin/open933' into open933-frontend 
Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js
 2016-07-11 11:29:35 -07:00
Henry
11caa8396a Updated modes 2016-07-11 11:18:23 -07:00
Henry
0017b77439 Merged markup changes 2016-07-11 11:06:22 -07:00
Charles Hacskaylo
7b7b21d748 [Frontend] Styling of Time Conductor v2 
Fixes #933
Tweaks to language; tweak to class name in markup
 2016-07-11 11:05:47 -07:00
Charles Hacskaylo
788483ec13 [Frontend] Styling of Time Conductor v2 
Fixes #933
Tweaks to language
 2016-07-11 10:37:08 -07:00
Charles Hacskaylo
7b19f91ce6 [Frontend] Merge latest from open933 
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
 2016-07-11 10:31:14 -07:00
Henry
5cc81ba12a [Time Conductor] Added mode class to time conductor 2016-07-11 10:26:34 -07:00
Charles Hacskaylo
0a0bc55f5f [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
 2016-07-08 17:11:43 -07:00
Henry
4e7b69c4df Enabled fixed and real-time modes 2016-07-08 16:57:50 -07:00
Charles Hacskaylo
cf83040c4b [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
 2016-07-08 16:54:49 -07:00
Charles Hacskaylo
32f7bc86af [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
 2016-07-08 16:54:13 -07:00
Henry
e230b92946 Fixed bug with date selector having to be clicked twice 2016-07-08 15:15:12 -07:00
Henry
58ed500ecf Time sync via conductor 2016-07-07 16:57:03 -07:00
Henry
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -07:00
Henry
ee7c450e11 [Tables] Enabled auto-scroll by default fixes #1040 2016-06-20 16:18:26 -07:00
Pete Richards
8ac6ac97f0 Merge remote-tracking branch 'origin/open972' 2016-06-16 11:08:43 -07:00
Henry
c2517c1670 [Edit Mode] Canceling edit mode with unsaved changes now shows confirmation dialog to user. Fixes #664 2016-06-15 17:10:29 -07:00
Andrew Henry
717ceff02c Merge pull request #995 from nasa/timeline-913a 
R&I tweaks to Timeline scrollbar and splitters
 2016-06-15 11:45:17 -07:00
Victor Woeltjen
50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934 
Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html
 2016-06-15 10:05:20 -07:00
Henry
79406cf1ed [Tables] #972 Refactored to simplify code. Fixes #972 2016-06-14 16:34:07 -07:00
Pete Richards
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
Pete Richards
11bc48c7e0 Merge remote-tracking branch 'origin/timeline-console-error-978' 2016-06-14 10:41:26 -07:00
Pete Richards
4c097faf88 Merge remote-tracking branch 'origin/timeline-flash-997' 2016-06-10 14:50:36 -07:00
Andrew Henry
acd0fae040 [Tables] Recalculate column dimensions on resize. Fixes #861 2016-06-09 12:59:46 +01:00
Victor Woeltjen
a1b2175801 [Timeline] Reduce flicker 
Reposition scroll bar in Timeline with RAF instead of timeout;
this ensures that scroll bar is positioned after the current
digest (updating the width) but before the results are rendered
(avoiding flicker.) Fixes #997
 2016-06-07 10:05:51 -07:00
Victor Woeltjen
23b64951f3 [Timeline] Update zoom controller spec 
...to reflect changes/simplifications for #936.
 2016-06-02 16:42:09 -07:00
Victor Woeltjen
99590d18f7 [Timeline] Simplify bounds-tracking 2016-06-02 16:40:07 -07:00
Victor Woeltjen
86b31bc040 [Timeline] Simplify scroll-setting 2016-06-02 16:38:11 -07:00
Victor Woeltjen
d52bfed1df [Timeline] Always set scroll on timeout 
...to allow time for width to increase.
 2016-06-02 16:36:09 -07:00
Charles Hacskaylo
808ccd0376 [Frontend] Tweaks to splitter 
Fixes #913
- IN PROGRESS: working on making
smaller splitter in Timelines
 2016-06-02 16:23:42 -07:00
Victor Woeltjen
44d6456de1 [Timeline] Set scroll on timeout 
Whenever timeline zoom controller sets scroll, check to see if
there may be a width violation that causes scroll to be reset,
and retry on a timeout if so. Fixes #936.
 2016-06-02 16:05:28 -07:00
Charles Hacskaylo
a394b95259 [Frontend] Tweaks to scrollbar visibility 
Fixes #913
- Scrollbar now always visible in the right side
of the tabular area, in order to avoid column
bottom edges not aligning;
 2016-06-02 16:04:26 -07:00
Victor Woeltjen
d02f4041b2 [Timeline] Update scroll position on timeout 
Fixes #817
 2016-06-02 15:34:32 -07:00
Victor Woeltjen
026ece3956 [Timeline] Provide greater initial width 
This avoids starting with a scrollable width too small for the
initial scroll position that the zoom controller selects.
Fixes #817
 2016-06-02 14:48:58 -07:00
Victor Woeltjen
ea676b4368 Merge remote-tracking branch 'origin/master' into table-export-934 2016-06-01 10:33:53 -07:00
Victor Woeltjen
cc7d0477e8 [Timeline] Check for existence of timespan 
...before attempting to calculate a width based on it.
Fixes #978.
 2016-05-31 16:41:30 -07:00
Victor Woeltjen
5a2d1a746d [Timeline] Add missing semicolon 2016-05-31 16:27:59 -07:00
Victor Woeltjen
4f0e3fdf85 [Timeline] Test zoom controller's width 2016-05-31 16:21:40 -07:00
Victor Woeltjen
be9f56107c [Timeline] Remove obsolete test cases 2016-05-31 16:15:57 -07:00
Victor Woeltjen
787f3815df [Timeline] Expose width from ZoomController 
...and ensure that the width exposed is not excessively
large; fixes #981
 2016-05-31 16:12:49 -07:00
Victor Woeltjen
35d7d9b380 [Timeline] Remove width method 
...from TimelineController. Will replace with a more straightforward
call to the zoom controller that uses the exposed end time instead,
to address #981.
 2016-05-31 16:05:06 -07:00
Charles Hacskaylo
8b9c51f303 [Frontend] Styling Export button 
fixes #973
- Done;
- Styling for Export button and tabular view
area in layout frame context;
- Export button in frame context now
hidden until user hovers over tabular
view area in frame, includes animated
transition;
- Normalized line-height on button and
menu elements in frame context;
- Layout/markup/SASS for historical and
RT tabular view modified;
- Converted imagery.html layout
to use flexbox;
 2016-05-31 11:40:31 -07:00
Charles Hacskaylo
661b3d5889 [Frontend] Styling Export button 
fixes #973
- In progress:
- Added new download symbol to symbols font;
- Added export symbol to export button;
- Layout/markup/SASS for historical tabular
view modified;
 2016-05-31 09:50:12 -07:00
Andrew Henry
01c85cb58d [Table] #972 Further refactoring, tests, style fixes 2016-05-31 12:05:40 +01:00
Henry
0218f42e2b removed redundant code 2016-05-27 15:25:06 -07:00
Henry
d8d0f22889 Second rewrite 2016-05-27 15:14:46 -07:00
Henry
d8a097a95a [Tables] Added timeouts to yield control to ui thread. Fixes #972 2016-05-27 15:14:45 -07:00
Andrew Henry
8f9308de01 Merge pull request #962 from nasa/csv-export-update-751 
[Timeline] Updates to CSV Export
 2016-05-27 14:55:59 -07:00
Victor Woeltjen
dade6b2254 [Timeline] Use positive logic for clarity 
https://github.com/nasa/openmct/pull/962#discussion_r64678013
 2016-05-26 12:12:52 -07:00
Victor Woeltjen
e9cac6eff3 [Timeline] Add JSDoc for new parameter 
https://github.com/nasa/openmct/pull/962#discussion_r64677520
 2016-05-26 12:12:52 -07:00
Henry
7fc2fcfa07 [Edit Mode] #629 Rewrote obsolete DomainColumn tests 2016-05-26 11:55:13 -07:00
Victor Woeltjen
5689279954 [Timeline] Add JSDoc for idMap 
https://github.com/nasa/openmct/pull/962#discussion_r64676750
https://github.com/nasa/openmct/pull/962#discussion_r64677198
 2016-05-26 11:53:16 -07:00
Victor Woeltjen
04112956cf Merge pull request #964 from nasa/open913 
R&I open913: various Timeline fixes
 2016-05-26 11:47:06 -07:00
Henry
eda1f23df9 [Edit Mode] #629 rewriting disabled tests 2016-05-26 11:38:12 -07:00
Victor Woeltjen
d15d27af73 Merge branch 'master' into table-export-934 2016-05-26 10:42:35 -07:00
Charles Hacskaylo
33c208d8fe [Frontend] Timeline Gantt bar mods to allow small min-width 
open #965
- CSS adjusted to handle min-width of 2px and better
approach to ellipsizing text;
- Angular ng-class added to hide icon and title if
width less than a value;
- Rounded corners on bars removed;
 2016-05-25 20:52:36 -07:00
Charles Hacskaylo
c557fb6cd5 [Frontend] Cursor properties modified 
open #768
 2016-05-25 19:39:56 -07:00
Charles Hacskaylo
bde2bc7709 [Frontend] Bottom of holder divs adjusted 
open #913
 2016-05-25 19:28:28 -07:00
Andrew Henry
5fe759aa91 Merge pull request #955 from nasa/timeline-zoom-936 
[Timeline] Improve zoom behaviors
 2016-05-25 16:58:20 -07:00
Victor Woeltjen
a5b7badb95 [Timeline] Remove obsolete arguments 
https://github.com/nasa/openmct/pull/955/files#r64668507
 2016-05-25 16:08:28 -07:00
Victor Woeltjen
438511c5f7 [Table] Test CSV Export behavior 2016-05-25 15:07:17 -07:00
Victor Woeltjen
3eb960cf5a [Table] Move export button out of scroll 2016-05-25 14:50:06 -07:00
Victor Woeltjen
699f6ba458 [Table] Export table contents as CSV 2016-05-25 13:54:10 -07:00
Victor Woeltjen
f21f22d95c [Table] Tweak appearance of export button 2016-05-25 13:43:44 -07:00
Victor Woeltjen
b520d08818 [Table] Begin work on CSV export 
#934
 2016-05-25 13:23:19 -07:00
Victor Woeltjen
f9fd97230f [Timeline] Satisfy JSHint 2016-05-25 12:37:03 -07:00
Victor Woeltjen
73b922facf [Timeline] Update specs for indexes instead of ids 2016-05-25 12:32:44 -07:00
Victor Woeltjen
ba0d9a186b [Timeline] Account for new argument in spec 2016-05-25 12:26:47 -07:00
Victor Woeltjen
80f5cb756d [Timeline] Account for new argument in spec 2016-05-25 12:25:58 -07:00
Victor Woeltjen
d7f566088f [Timeline] Update spec to include logging 2016-05-25 12:25:02 -07:00
Victor Woeltjen
a3bcaea7f9 [Timeline] Show units in utilization headers 2016-05-25 12:21:58 -07:00
Victor Woeltjen
23c71b7218 [Timeline] Include units for utilizations 2016-05-25 12:12:11 -07:00
Victor Woeltjen
463f7ccf65 [Timeline] Use indexes instead of UUIDs 2016-05-25 12:07:35 -07:00
Victor Woeltjen
87fe407739 Merge branch 'master' into csv-export-update-751 2016-05-25 12:00:43 -07:00
Victor Woeltjen
52e087d8f8 Merge pull request #954 from nasa/open628 
[Edit Mode] #628 Remove edit related concerns from Create Action
 2016-05-25 11:55:17 -07:00
Victor Woeltjen
952f95aa4c [Timeline] Update failing specs 2016-05-25 11:33:51 -07:00
Victor Woeltjen
0a75a5be1f [Timeline] Add minimal test case 2016-05-25 11:28:00 -07:00
Victor Woeltjen
70b593e28a [Timeline] Watch for configuration object 
...to address #908 in a manner which does not cause #957
 2016-05-25 11:22:22 -07:00
Victor Woeltjen
bb4f1ce7cd [Timeline] Include utilization columns 2016-05-25 10:52:25 -07:00
Victor Woeltjen
0cc2ba7595 [Timeline] Import UtilizationColumn 2016-05-25 10:38:00 -07:00
Victor Woeltjen
8162429106 [Timeline] Pass in resources extensions 2016-05-25 10:37:01 -07:00
Victor Woeltjen
ed519d89d7 [Timeline] Log errors during CSV export 
#751
 2016-05-25 10:35:29 -07:00
Victor Woeltjen
0e4f6185b8 Merge branch 'master' into csv-export-update-751 
Conflicts:
	platform/features/timeline/bundle.js
 2016-05-25 10:29:56 -07:00
Victor Woeltjen
00534f8af7 [Timeline] Account for tick size 
Account for tick size in duration reported by TimelineZoomController,
to avoid tick marks being cut off prematurely due to changes for
#936
 2016-05-24 13:02:30 -07:00
Victor Woeltjen
3795570938 [Timeline] Rename shadowing variable 2016-05-24 12:45:25 -07:00
Victor Woeltjen
362248a02e [Timeline] Run gulp fixstyle 2016-05-24 12:37:10 -07:00
Victor Woeltjen
16d20eabd2 [Timeline] Simplify method 2016-05-24 12:33:47 -07:00
Victor Woeltjen
eb5566f041 [Timeline] Add tests for timeline zoom changes 2016-05-24 12:33:19 -07:00
Victor Woeltjen
757da1dff4 [Timeline] Remove obsolete test cases 2016-05-24 11:54:49 -07:00
Victor Woeltjen
85432af187 [Timeline] Don't store zoom configuration 
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
 2016-05-24 11:53:27 -07:00
Henry
96af931c0b Modified EditActionPolicy to prevent editing of table views unless object is a table type 2016-05-23 16:48:31 -07:00
Victor Woeltjen
9a5209f7c2 [Timeline] Add zoom-to-fit button 2016-05-23 16:06:10 -07:00
Victor Woeltjen
0818a7cda0 [Timeline] Increase maximum zoom level 
#936
 2016-05-23 15:36:26 -07:00
Victor Woeltjen
f35947361c [Timeline] Remain centered during zoom 
#936
 2016-05-23 15:32:48 -07:00
Henry
b6502e9ea1 [New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController 2016-05-20 14:12:24 -07:00
Andrew Henry
25a2321578 Merge pull request #927 from nasa/jscs-rebase-142 
[Code Style] Enforce code style
 2016-05-20 14:03:27 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
b5229d7786 [Timeline] Commit changes on toggle 
#908
 2016-05-19 15:06:06 -07:00
Victor Woeltjen
f9631ff4c5 [Code Style] Fix style missed by gulp fixstyle 
...and remove an unnecessary comment, too.
 2016-05-19 11:29:41 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle 
...to apply code style settings from #142.
 2016-05-19 11:29:13 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
836b5db8cf Reviewed edit mode checking 2016-05-12 16:11:57 -07:00
Henry
d00e13e4ee Resolved merge conflicts 2016-05-12 16:09:53 -07:00
Henry
433dd87e51 Resolved merge conflicts 2016-05-12 16:07:39 -07:00
Henry
cf9eb3f602 Resolved Merge conflicts, removed previously deleted files 2016-05-12 16:05:27 -07:00
Victor Woeltjen
116c6e57ed Merge pull request #918 from nasa/rt-updates-910 
[Table] Remove length check when updating visible rows
 2016-05-11 14:07:27 -07:00
Charles Hacskaylo
a58fe1f81c [Frontend] Modified .tick-labels in Timelines 
open #909
- Changed markup to not use plot .tick-label class;
- Changed CSS accordingly;
- Fixed alignment (clipped bottom value) by
refactoring to use flex-box layout for tick labels;
 2016-05-10 20:41:52 -07:00
Victor Woeltjen
c448753bab [Table] Remove length check when updating visible rows 
While the number of visible rows may not have changed, their
contents may have; returning early here results in #910.
 2016-05-10 15:20:22 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Pete Richards
1c6ef28b80 [Table] Fix headers in firefox 
Don't use table-cell displays for cells, resolves issues with zero-sized
tbody causing thead to be 100% of table size.

Fixes https://github.com/nasa/openmct/issues/809
 2016-05-04 11:13:12 -07:00
Andrew Henry
6bf1ef5bcc Revert "Revert "[Tables] Fix to correct sorting in realtime tables"" 2016-04-22 09:44:34 -07:00
Andrew Henry
8b390e7fb9 Revert "[Tables] Fix to correct sorting in realtime tables" 2016-04-20 19:31:54 -07:00
Andrew Henry
29bce69eea Merge pull request #822 from nasa/open769 
[Tables] Fix to correct sorting in realtime tables
 2016-04-20 19:30:04 -07:00
Henry
aac5a6d250 #769 - Removed empty code block and addressed some excessive guard code 2016-04-20 19:18:27 -07:00
Victor Woeltjen
f16a107105 [Timeline] Inject resources into CSV action 2016-04-15 08:51:22 -07:00
Victor Woeltjen
f683ca44a2 [Timeline] Read resource utilizations during CSV export 2016-04-15 08:45:42 -07:00
Victor Woeltjen
546cde56a8 [Timeline] Expose internal resource utilization 
...to allow this to be exported for CSV, #751
 2016-04-15 08:32:34 -07:00
Pete Richards
7a7877d7c4 [Conductor] Add basic style for phone 
Add styling for time conductor on mobile that removes slider and rearranges
inputs to utilize space more effectively.

https://github.com/nasa/openmct/issues/318
 2016-04-13 16:17:17 -07:00
Henry
6322964dec Addressed comments from code review of #822 2016-04-11 14:30:21 -07:00
Henry
1bb6e17829 Minor code change to improve clarity 2016-04-11 13:37:31 -07:00