Joel McKinnon
06a5207c6d
deriving current output from current (blue) condition output and persisting
2020-01-14 17:07:32 -08:00
Joel McKinnon
78b885c508
using current condition output for current output label
2020-01-14 13:44:19 -08:00
Joshi
a18a3b6099
Adds telemetry objects on composition add
2020-01-14 13:32:13 -08:00
Joshi
654333dabe
Removes fdescribe
2020-01-14 10:59:11 -08:00
Joshi
81b8a76f1b
(WIP) Fixes cyclic error while saving conditionCollection
2020-01-14 10:57:00 -08:00
Joshi
31736fa194
Merge branch 'conditionSet-view' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-14 10:27:10 -08:00
Joshi
33632ef1dc
(WIP) conditionSets using ConditionClasses
2020-01-14 09:52:12 -08:00
Joel McKinnon
94305ed82c
persist data changes on update
2020-01-14 09:29:00 -08:00
Joel McKinnon
c8abc45e25
add default condition only when none present
2020-01-14 08:38:12 -08:00
Joshi
cd25459ac9
Merge branch 'conditionSet-telemetry' of https://github.com/nasa/openmct into conditionSet-view
2020-01-13 22:53:45 -08:00
Joshi
aaf1eb8059
Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-view
2020-01-13 22:52:51 -08:00
Joshi
1589e4236a
Merge branch 'conditionSet-telemetry' of https://github.com/nasa/openmct into condition-class
2020-01-13 22:51:13 -08:00
Joshi
8ca202d0a9
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class
2020-01-13 22:48:08 -08:00
Joshi
d2f7904118
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-telemetry
2020-01-13 22:47:52 -08:00
Joshi
8bbd7898bb
Updates conditionSet composition policy to allow only telemetry since we're no longer using composition for condition domain objects
2020-01-13 14:59:45 -08:00
Nikhil Mandlik
ea6f8c9a50
small fixes
2020-01-13 14:45:00 -08:00
Joshi
d152440436
Fixes careless mistake - undefined object.
2020-01-13 14:12:05 -08:00
Joshi
1ffe76a525
Fixes linting issue.
2020-01-13 14:09:59 -08:00
Joshi
a6825f530c
Fixes failing test.
2020-01-13 14:05:43 -08:00
Joshi
7cf6dc386f
Removes use of createOpenMCT and uses mock object for openmct instead.
2020-01-13 13:58:25 -08:00
Joshi
5d8252bb07
Adds tests for condition class
2020-01-13 13:55:54 -08:00
Joel McKinnon
e1e1e0fb2f
temp
2020-01-13 13:52:26 -08:00
Joel McKinnon
4f7345563f
temp
2020-01-13 13:40:43 -08:00
Joel McKinnon
68a2b9f3a8
added Default name
2020-01-10 16:45:20 -08:00
Joel McKinnon
d79402c568
name property WIP
2020-01-10 15:58:16 -08:00
Joel McKinnon
d0e8f650be
remove condition with persistance
2020-01-10 12:59:43 -08:00
Joel McKinnon
d819c6efe2
add condition button working with persistance
2020-01-10 12:22:05 -08:00
Joshi
91c877f234
Adds tests for Condition class
2020-01-10 10:43:55 -08:00
Joshi
55a674ba7b
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class
2020-01-09 06:46:27 -08:00
Joshi
36055b7c04
Changes name of emitted event
2020-01-09 06:44:19 -08:00
Joshi
fe3cc661d3
Fixes tests.
2020-01-08 12:20:17 -08:00
Joshi
eb7efae1cc
Persist condition to conditionSet. Remove extra condition unshift in addCondition method.
2020-01-07 11:56:24 -08:00
Joshi
63f8fb54d4
conditions added to conditioncollection
2020-01-07 11:42:31 -08:00
Joshi
097fa2e655
condition collection add to composition
2020-01-07 08:44:30 -08:00
Joshi
3d0b4d51c2
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into telemetry-criterion
2020-01-06 13:10:58 -08:00
Joel McKinnon
6ccc0b4fbf
added TODO comments
2020-01-06 12:04:19 -08:00
Joel McKinnon
79fe95372d
fix lint errors
2020-01-06 10:44:09 -08:00
Joel McKinnon
c094e6c6f4
change icon
2020-01-06 10:35:10 -08:00
Joshi
8c796b4e57
Allows adding new conditions and associated criteria.
...
Stub for evaluating conditions.
2020-01-06 10:09:47 -08:00
Joel McKinnon
c08e9a89ff
add condition
2020-01-06 09:48:11 -08:00
Joshi
cc8ba18ccc
Fixes condition plugin tests
2020-01-03 11:27:06 -08:00
Joel McKinnon
57c671a42e
combined tests in one pluginSpec file
2020-01-03 09:13:17 -08:00
Joel McKinnon
1ee6ecf3ae
removed conditionSet folder and fixed lint errors
2020-01-03 08:39:13 -08:00
Joel McKinnon
5f80b3773b
restructured folders
2020-01-02 15:19:57 -08:00
Joel McKinnon
8452455050
WIP: all condition set UI elements in place - started condition form elements
2020-01-02 12:59:32 -08:00
Joel McKinnon
e5d8f60cdb
WIP: all condition set UI elements in place except condition form elements
2019-12-31 11:33:33 -08:00
Joel McKinnon
de466000a0
WIP: styling for conditionSet and condition
2019-12-30 18:26:59 -08:00
Joel McKinnon
49664c011c
component styling and expand funcitonality
2019-12-27 18:17:56 -08:00
Joel McKinnon
e52f6ce099
WIP: styling components
2019-12-27 14:19:39 -08:00
Joel McKinnon
d38e2c49cb
WIP: current output styling
2019-12-27 13:20:21 -08:00
Joshi
f8464fa76f
Adds telemetry criterion class and related tests
2019-12-27 12:57:30 -08:00
Joel McKinnon
308ae2cb2e
added CurrentOutput and TestData components
2019-12-26 16:07:55 -08:00
Joel McKinnon
88219659fb
renamed Conditions component to ConditionSet
2019-12-26 13:40:58 -08:00
Joel McKinnon
c34c2df061
remove fdescribe
2019-12-26 12:36:58 -08:00
Joel McKinnon
99c7bd4c10
added conditions and condition components
2019-12-26 12:25:30 -08:00
Joel McKinnon
f93d5a6fbf
skeletal html mockup
2019-12-26 08:25:58 -08:00
Joel McKinnon
cd116667be
change to inject domainObject
2019-12-23 14:32:57 -08:00
Joel McKinnon
2f2de3952d
addressed review comments
2019-12-23 12:14:35 -08:00
Joel McKinnon
45e56798c5
removed fit
2019-12-23 11:24:25 -08:00
Joel McKinnon
0664d480e6
conditionSet provider with tests
2019-12-23 11:19:56 -08:00
Joel McKinnon
283599ddf5
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-view-provider
2019-12-20 09:56:26 -08:00
Joshi
87f76ebfe4
Addresses comments.
2019-12-19 21:20:38 -08:00
Joshi
55a195b841
Adds ConditionSet composition policy. Allows conditions to be added to conditionSets
2019-12-19 12:33:11 -08:00
Joel McKinnon
c7946fd7b3
refactor conditionSet pluginSpec
2019-12-19 11:14:55 -08:00
Joel McKinnon
5d3ba3199c
Merge remote-tracking branch 'origin/topic-conditionals' into conditionSet-view-provider
2019-12-19 09:07:44 -08:00
Joel McKinnon
f0d10306fc
completing merge
2019-12-19 09:06:19 -08:00
Shefali Joshi
e545043a26
Merge branch 'topic-conditionals' into condition-type
2019-12-18 15:52:46 -08:00
Joshi
1f9d4708b3
Adds copyright
2019-12-18 13:19:21 -08:00
Joshi
162809e081
[ #2570 ] adds new condition type and plugin. Also adds tests
2019-12-18 13:13:54 -08:00
Joel McKinnon
482c871ac2
removed fdescribe
2019-12-18 13:10:29 -08:00
Joel McKinnon
f0b3311630
fixed merge conflicts
2019-12-18 13:01:28 -08:00
Joel McKinnon
656d6d6c3f
addressed review comments
2019-12-18 12:48:05 -08:00
Joel McKinnon
ea45f0f4aa
WIP
2019-12-18 12:16:25 -08:00
Joel McKinnon
6a25cb0a58
renaming
2019-12-18 11:50:10 -08:00
Joel McKinnon
4a1901420d
removed fdescribe
2019-12-18 11:44:40 -08:00
Joel McKinnon
ad64f00608
WIP renaming
2019-12-18 11:43:20 -08:00
Joel McKinnon
65aea29cb9
renamed conditionCollection to conditionSet and made all filenames and references consistent
2019-12-18 11:23:37 -08:00
Joel McKinnon
7981424e9a
WIP: - preparing to rename branch
2019-12-18 11:08:21 -08:00
Joel McKinnon
10c4340475
completed tests for condition collection object
2019-12-17 13:24:34 -08:00
Joel McKinnon
0a95db1a51
fixed missing commas
2019-12-17 08:15:15 -08:00
Joel McKinnon
ace77dce65
WIP
2019-12-17 08:10:35 -08:00
Joel McKinnon
c1d58bb25f
fixed another minor merge conflict
2019-12-16 16:55:26 -08:00
Joel McKinnon
fbcafe0f62
mfixed merge conflicts
2019-12-16 16:50:57 -08:00
Joel McKinnon
9a9d9222a9
Merge branch 'master' into condition-object-type
2019-12-16 14:52:48 -08:00
Joel McKinnon
221e5b4f6c
Added tests for ConditionPlugin
2019-12-16 14:42:19 -08:00
Joshi
5df74aee68
[test-framework] Adds basic test for condition plugin
2019-12-16 11:06:19 -08:00
Nikhil
3b195e9c7d
Example imagery vue ( #2525 )
...
* WIP: imagery vue refactor
* cleaup
* show orange border when paused.
* resize image and thumbs wrappers.
* scrollToBottom fixed.
* fixed lint errors
* use multipane vue component for resize + cleanup + style adjustments.
* added min-height to image pane and thumbs-layout pane.
* remove old plugin and using es6 const.
* using ES6 imports.
* clean up + formatting changes.
* updated as per review comments.
* extracted styles from vue component.
* fixed lint errors.
* updated as per review comments + cleanup.
2019-12-13 15:36:01 -08:00
Joel McKinnon
17838d8040
WIP: setting up test framework for conditionals
2019-12-12 14:36:24 -08:00
Andrew Henry
ef3bae1312
Merge branch 'topic-core-refactor' into tcr-master
2019-12-11 15:56:24 -08:00
Nikhil
37a8cf071c
https://github.com/nasa/openmct/issues/2577 ( #2580 )
...
* https://github.com/nasa/openmct/issues/2577
* Remove notebook.scss import. Move to vue-styles.scss
2019-12-11 15:56:00 -08:00
Andrew Henry
98c9cc92b8
Merge branch 'topic-core-refactor' into tcr-master
2019-12-11 14:52:11 -08:00
Deep Tailor
490cb2225d
Move check for linestyle to plotseries fetch function ( #2561 )
2019-12-11 14:49:12 -08:00
Andrew Henry
ecd8372efa
Fixed merged conflict
2019-12-11 14:40:53 -08:00
Nikhil
50173a4413
Theming ( #2567 )
...
* Separate Vue component styles out from SFCs.
* Added 'MCT.prototype.getAssetPath' and using 'openmct.setAssetPath' to get relative path for assets.
* Re-implements `openmct.plugins.Snow()`, and `openmct.plugins.Espresso()` (as well as a new theme `openmct.plugins.Maelstron()`)
2019-12-11 14:27:13 -08:00
Charles Hacskaylo
a16a44208a
Fixes Notebook and Inspector layout issues ( #2568 )
...
* Fix linting-related issues
* Fix Notebook overlay display issues
2019-12-10 16:44:54 -08:00
Joel McKinnon
f82ca91a61
changed node mules path
2019-12-06 15:13:03 -08:00
Joel McKinnon
b06c234b59
import path for vue component
2019-12-06 13:02:23 -08:00
Joel McKinnon
31a7ebd4f1
basic skeleton for conditions code
2019-12-06 12:05:36 -08:00
Andrew Henry
c83e44ff1c
Merged from master
2019-12-06 09:45:21 -08:00
Deep Tailor
28d2194d51
fix bugs caused by shouldUseMinMax reported by VISTA ( #2555 )
2019-12-05 18:07:30 -08:00