Skip to content

Commit

Permalink
Pre-release tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Jeffery committed Jan 27, 2017
1 parent 067a28d commit 2fb5ca1
Show file tree
Hide file tree
Showing 7 changed files with 302 additions and 189 deletions.
13 changes: 13 additions & 0 deletions documentation/importdata/importsettings/dataset.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,17 @@ googleAnalyticsId
initialSessionState
*Block.* The default tabs, popups and recently used genes and queries for a new session. Most easily set by using the save button on the header (only shown to managers).

genomeBrowserChannelSets
*List.* Default:[]. A list of exmaple channel configurations that will be shown on the genome browser sidebar.
The block can contain the following keys:
channels
*List (required).* List of serialised channels.

name
*Text (required).* Channel set name.

description
*Text (required).* Channel set description.



13 changes: 3 additions & 10 deletions documentation/importdata/importsettings/datatable.rst
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,15 @@ storedQueries
*Text (required).* a display name for this query.


maxCountQueryRecords
*Value.* Default:200000. Defines the maximum number of records that will be downloaded to the client.
This limit influences views that display individual data items, such as scatter plots and geographical map views.
If not specified, this defaults to 200,000.

maxCountQueryAggregated
*Value.* Default:1000000. Defines the maximum number of records that will be queried on the server for views that present
data items in an aggregated way, such as histograms and bar graphs.
If not specified, this defaults to 1,000,000.

fetchRecordCount
*Boolean.* Default:False. .

quickFindFields
*PropertyIDs.* The list of properties will be used by some tools in the software that allow the user to quickly find a (set of) item(s).

previewProperties
*PropertyIDs.* The list of properties that will be shown (along with the primary key) when the item is previewed such as in genome browser .

disableSubsets
*Boolean.* If set, there will be no subsets options for this data table.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ This is achieved by combining information from two data tables:
A set of properties of the current table is used to define pie sizes on all pie charts.
For each pie and location combination there should be a property in the data table,
containing the relative size of that specific pie
pieChartSize
*Value (required).* Displayed size of the largest pie chart(only applies if *type* is PieChartMap).

mapCenter
*Block (required).* Specifies the map center in the start view(only applies if *type* is PieChartMap).
The block can contain the following keys:
Expand All @@ -86,10 +83,6 @@ dataType

- ``Fraction``: .

positionOffsetFraction
*Value (required).* An offset between the pie chart location and the actual chart,
used to achieve a nice (ideally non-overlapping) view(only applies if *type* is PieChartMap).

locationDataTable
*Text (required).* ID of the data table containing the locations
(this table should have properties with ``GeoLongitude`` and ``GeoLatitude`` data types)(only applies if *type* is PieChartMap).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ browserShowOnTop
*Boolean.* Indicates that the track will be shown in the top (non-scrolling) area of the genome browser.
In this case, it will always be visible (only applies if *showInBrowser* is True).

channelColor
*Text.* Default:rgb(0,0,0). Colour used to display this property in the genome browser. Formatted as ``"rgb(r,g,b)"``
(only applies if *showInBrowser* is True).
colour
*Text.* Colour used to display this property. Formatted as ``"rgb(r,g,b)"`` or ``"#HHHHHH"``
.

defaultVisible
*Boolean.* Default:True. .
Expand Down
6 changes: 3 additions & 3 deletions webapp/dist/panoptes/babel.js

Large diffs are not rendered by default.

156 changes: 143 additions & 13 deletions webapp/dist/panoptes/index.html

Large diffs are not rendered by default.

290 changes: 137 additions & 153 deletions webapp/dist/panoptes/panoptes.js

Large diffs are not rendered by default.

0 comments on commit 2fb5ca1

Please sign in to comment.