Commit Graph

1916 Commits

Author SHA1 Message Date
cebdf24666 [Plot] Only highlight legend if multiple
Legend items will only be highlighted when
selected for inspection if there are more
than one legend item in the plot.
2015-08-28 16:22:07 -07:00
15152d26f8 [Inspector] Tree expansion does not inspect
Changed the ng-click location on the tree
node so that expanding a folder or other tree
node does not inspect that object. Clicking
on the label still inspects it though.
2015-08-28 16:14:53 -07:00
50c08a15d6 [Inspector] Inspection of Library and Elements
In edit mode, the user can now use the object
inspector to inspect the objects contained
within the Library and Elements panes.
2015-08-28 11:50:16 -07:00
8f40d7d9ee [Inspector] Inspect any descendent of layout
Clicking on any subelement of the layout,
indluding sub-sub-elements and so on, will
now inspect that element.
2015-08-28 11:33:10 -07:00
38b09fbeb1 [Inspector] Inspect subelements of layout
Clicking on something inside of a layout
both in browse and edit mode should set
that object to be inspected.
2015-08-28 11:20:06 -07:00
455f4b6bdb [Inspection] Add object inspector to edit mode
Added an additional right pane to edit mode for
the object inspector. Info of the editing object
is displayed by default. If plot legends are
clicked, those are inspected the same as in
browse mode.
2015-08-28 10:59:51 -07:00
b0b87d7fd9 [Inspector] Update controller and its tests
Update ObjectInspectorController to first look at
ngModel.inspectionObjects before defaulting back
to ngModel.selectedObject
Updated tests accordingly.
2015-08-28 10:31:44 -07:00
8c811c4a22 [Inspector] Change how inspection objects are changed
Instead of resetting the inspection objects
when a treenode is clicked, it is changed when
the view changes.
2015-08-27 16:53:13 -07:00
f1bf88fac4 [Inspector] Reorganization of scss files
Split the inspector styling out of the general
panes styling. Moved files into more appropriate
folders.
2015-08-27 16:41:11 -07:00
cf421f8b9a [Plot] Cleanup
Remove console.log statements.
Check for array existence before pushing.
2015-08-27 16:34:03 -07:00
953bd9d8fc [Inspector] Inform user of multiple selection
The object inspector now displays how many
selected items there are if there are more
than one.
2015-08-27 16:31:42 -07:00
95791d5c3a [Inspector] Select domainObject with title
The inspector object array can be reset to the
domain object by clicking the title header.
2015-08-27 16:28:13 -07:00
30cd3d0074 [Plot] Legend item selection style
Some better styling for selected legend items.
Renamed inspector/_inspector.scss to
inspector/_plot.scss to better reflect content
of the file.
2015-08-27 16:16:22 -07:00
cd4bc6c3b4 [Inspector] Update font symbols 2015-08-27 15:51:27 -07:00
4de8d91890 [Inspector] Multiple selection of plot legend items
Can now shift-click to add more than one
object to the inspector array. Does not
yet reflect in inspector itself.
2015-08-27 12:35:50 -07:00
1dd3d5214d [Plot] Highlight inspected plot legend items
Plot legend items that are being selected for
inspection are now highligted.
2015-08-27 12:10:13 -07:00
bcf6bbf627 [Inspector] Lay groundwork for multiple selection
Created a new ngModel property for inspection
which is an array. Currently the array only
holds one object at a time, but it can be
expanded in the future.
2015-08-27 11:28:27 -07:00
01f5a4886b [Plot] Make plot legend items clickable
Clicking on a plot legend item now selects
that object. Currently that means that the
view is switched to that object. (Therefore
this only has an effect on telemetry panel
plots.)
2015-08-27 11:02:40 -07:00
815b8e040e [Inspector] Merge paneModel and treeModel
Use the treeModel for what the paneModel was
previously being used for. None of the
property names conflict. This allows the
right pane to access the treeModel info.
2015-08-27 10:49:57 -07:00
a957f87f61 Merge branch 'master' into inspector 2015-08-27 10:40:43 -07:00
5230bdfc6b Merge pull request #86 from nasa/open51
Addresses nasa/openmct#51
2015-08-27 10:02:24 -07:00
97acf2012a Merge pull request #87 from nasa/open84
[Search] Hide link icons in search results
2015-08-27 10:00:34 -07:00
687d86790e [Action] RemoveAction
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
3ec4cc099b [Action] RemoveAction
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
2015-08-27 09:41:00 -07:00
dadbf3f6dc [Action] RemoveAction
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
2015-08-27 09:17:11 -07:00
c4c4c42415 [Elastic] Elastic Bundle
Elasticsearch bundle.json reverted back to
original.
2015-08-27 09:11:20 -07:00
7b9a886beb [Inspector] Cleanup
Some more undefined checking. Changed unnecissary scope
variable into a regular one.
2015-08-26 16:31:02 -07:00
2cd1907b71 [Search] Temporarily hide link icons
Hide link icons in search results to temporarily
fix issue #84.
2015-08-26 13:40:28 -07:00
7a69bffb4a [Inspector] Add test
Added a test to the browse object controller to
regain 100% coverage. Tests initilization of
ngModel properties. #73.
2015-08-26 10:51:34 -07:00
05fb7173aa [Inpsector] Inspector icon
Change from gear to info icon. #73.
2015-08-26 10:44:11 -07:00
57d1876dd8 [Inspector] Fix inspector pane transition
Changed the pane transition so that on
pane open the inspector becomes invisible
after the pane starts opening. #73.
2015-08-26 10:43:03 -07:00
7119f6f3a1 [Inspector] Splitter drag temporarily removes transition
Dragging mct-splitter will remove a 'slide'
class from the splitter's sibling while a
drag is in process, and then replace the
'slide' class. This allows the left and right
panes to have slide transitions for open/close,
but not when the splitter is being dragged. #73.
2015-08-26 10:23:18 -07:00
e7563ff4e9 [Action] Merge
Merged with master.
2015-08-26 10:11:23 -07:00
a507557cec [Remove] Remove Action
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
2015-08-26 10:07:51 -07:00
86d398d8ff [Inspector] Fix location label text
Fixed the location object labels so that their
overflow text properly gets hidden, and so that
the direction arrows are aligned with the
labels. #73.
2015-08-25 16:30:57 -07:00
5cc634e946 Merge branch 'open72' into open73
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-08-25 15:02:57 -07:00
7e837c266d Merge branch 'master' of https://github.com/nasa/openmctweb into open73
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
2015-08-25 14:59:13 -07:00
cd204af71c [Treeview] Compatability with search
Update to hide search bar when the pane is
closed. #72.
2015-08-25 14:55:23 -07:00
4e9348cb28 Merge branch 'master' of https://github.com/nasa/openmctweb into open72
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
2015-08-25 14:52:51 -07:00
509badb225 Merge pull request #55 from nasa/search
[Search] Create search UI
2015-08-25 14:41:19 -07:00
c4de3505b9 [Inspector] Location horizontal overflow
Modified location labels to have cut-off text
be indicated by ellipses when the inspection
pane width is small. #73.
2015-08-25 14:30:42 -07:00
c3e5fbf713 [Inspector] Location does not include self
Changed the object inspector's location getting
to not include the object itself in the
location, just its ancestors. #73.
2015-08-25 13:06:15 -07:00
5080b5296e [Inspector] Consistent link and nonlink style
Changed stlying on the labels for parent
lists to have more consistent styling
between the link and nonlink parents. #73.
2015-08-25 11:14:41 -07:00
7a7cabedcc [Inspector] Add hovertext and scrolling
Made the inspector capable of scrolling.
Added hovertext to the contextual and
primary location sections for some
clarification. #73.
2015-08-25 10:18:31 -07:00
6571da922d [Search] Update style for link icons
Added styling to correctly position and color
link icons within the search resutls list.
2015-08-25 08:56:32 -07:00
33d88ecce0 [Inspector] Update tests
Updated the object inspector controller spec to test
for the different types of locations. #73.
2015-08-24 16:16:15 -07:00
70324a2198 [Inspector] Separate primary and contextual locations
The object inspector now finds both the contextual
location of the link and the primary location of
the original, if the selected object is a link. #73.
2015-08-24 15:49:57 -07:00
c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
2015-08-24 13:14:43 -07:00
41198627c3 Merge branch 'master' of https://github.com/nasa/openmctweb into open72
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-08-24 13:08:48 -07:00
454b96c3c9 Merge branch 'master' of https://github.com/nasa/openmctweb into open73
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-08-24 13:06:44 -07:00