49560698f6
[Reorg] Make timeline-specific chart directive
...
Make a separate chart directive for drawing resource graphs in timelines. This
is in preparation for a new plot bundle which will make a large number of
changes to the drawing API to support newly requested features. By separating
code, there will be no impact to the timeline when the new plot features are
added.
2017-01-17 09:59:00 -08:00
1a88c9a651
Merge remote-tracking branch 'origin/master' into persist-on-mutation-825
2016-10-07 11:27:58 -07:00
e077f9ee18
[Timeline] Fix logic error
...
Issue #1185 . Also removed direct modification of domain object.
2016-09-30 21:34:03 +02:00
e9f4db7719
Merge branch 'master' of github.com:nasa/openmct into open1185
2016-09-30 21:25:36 +02:00
f185254114
[Formatting] Fix missing spaces
2016-09-20 17:41:45 +09:00
943e2ebe14
[Timeline] Convert SOC to use percentages
...
Also includes updated validation params which allow for floats to a maximum
of 100 as well as a percentage sign which is later removed.
2016-09-20 17:40:08 +09:00
d913798d5b
[Timeline] Add battery starting state-of-charge
...
Issue #1185
2016-09-18 22:52:41 +09:00
0ec27350e0
Update TimelineTickController.js
...
One correction by @akhenry, "region, not reign".
2016-09-16 16:50:11 -04:00
e751461194
Typo corrections, I avoided making changes to words that have regional spelling differences.
2016-09-03 09:16:54 -04:00
766e94ed62
Merge remote-tracking branch 'origin/master' into persist-on-mutation-825b
...
Conflicts:
platform/core/src/capabilities/PersistenceCapability.js
2016-07-25 16:30:49 -07:00
c8898ac6aa
[Documentation] Updated copyright statement. Fixes #1081
2016-07-12 16:55:57 -07:00
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
99590d18f7
[Timeline] Simplify bounds-tracking
2016-06-02 16:40:07 -07:00
86b31bc040
[Timeline] Simplify scroll-setting
2016-06-02 16:38:11 -07:00
d52bfed1df
[Timeline] Always set scroll on timeout
...
...to allow time for width to increase.
2016-06-02 16:36:09 -07:00
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
d02f4041b2
[Timeline] Update scroll position on timeout
...
Fixes #817
2016-06-02 15:34:32 -07:00
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
5a2d1a746d
[Timeline] Add missing semicolon
2016-05-31 16:27:59 -07:00
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
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
8f9308de01
Merge pull request #962 from nasa/csv-export-update-751
...
[Timeline] Updates to CSV Export
2016-05-27 14:55:59 -07:00
dade6b2254
[Timeline] Use positive logic for clarity
...
https://github.com/nasa/openmct/pull/962#discussion_r64678013
2016-05-26 12:12:52 -07:00
e9cac6eff3
[Timeline] Add JSDoc for new parameter
...
https://github.com/nasa/openmct/pull/962#discussion_r64677520
2016-05-26 12:12:52 -07:00
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
5fe759aa91
Merge pull request #955 from nasa/timeline-zoom-936
...
[Timeline] Improve zoom behaviors
2016-05-25 16:58:20 -07:00
f9fd97230f
[Timeline] Satisfy JSHint
2016-05-25 12:37:03 -07:00
a3bcaea7f9
[Timeline] Show units in utilization headers
2016-05-25 12:21:58 -07:00
23c71b7218
[Timeline] Include units for utilizations
2016-05-25 12:12:11 -07:00
463f7ccf65
[Timeline] Use indexes instead of UUIDs
2016-05-25 12:07:35 -07:00
87fe407739
Merge branch 'master' into csv-export-update-751
2016-05-25 12:00:43 -07:00
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
bb4f1ce7cd
[Timeline] Include utilization columns
2016-05-25 10:52:25 -07:00
0cc2ba7595
[Timeline] Import UtilizationColumn
2016-05-25 10:38:00 -07:00
8162429106
[Timeline] Pass in resources extensions
2016-05-25 10:37:01 -07:00
ed519d89d7
[Timeline] Log errors during CSV export
...
#751
2016-05-25 10:35:29 -07:00
0e4f6185b8
Merge branch 'master' into csv-export-update-751
...
Conflicts:
platform/features/timeline/bundle.js
2016-05-25 10:29:56 -07:00
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
3795570938
[Timeline] Rename shadowing variable
2016-05-24 12:45:25 -07:00
16d20eabd2
[Timeline] Simplify method
2016-05-24 12:33:47 -07:00
eb5566f041
[Timeline] Add tests for timeline zoom changes
2016-05-24 12:33:19 -07:00
85432af187
[Timeline] Don't store zoom configuration
...
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
2016-05-24 11:53:27 -07:00
9a5209f7c2
[Timeline] Add zoom-to-fit button
2016-05-23 16:06:10 -07:00
f35947361c
[Timeline] Remain centered during zoom
...
#936
2016-05-23 15:32:48 -07:00
264896c264
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
platform/commonUI/edit/test/actions/RemoveActionSpec.js
platform/entanglement/src/services/LinkService.js
platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js
2016-05-20 14:26:39 -07:00
ad5691142e
[Code Style] Rename shadowing variables
2016-05-20 13:05:32 -07:00
d5914dfde9
[Persistence] Remove caching of persistence capability
...
...as this no longer needs to be invoked directly.
2016-05-19 11:42:58 -07:00
d3f2a24267
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/core/src/capabilities/PersistenceCapability.js
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
2016-05-19 11:41:08 -07:00
f9631ff4c5
[Code Style] Fix style missed by gulp fixstyle
...
...and remove an unnecessary comment, too.
2016-05-19 11:29:41 -07:00
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
