Skip to content

Commit

Permalink
Adding hover texts on the widgets that explain what htey are for, hwo…
Browse files Browse the repository at this point in the history
… they can be connected to the data for beltrame#38 and beltrame#39
  • Loading branch information
cesine committed Oct 19, 2014
1 parent 893f443 commit 0a91e7c
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 6 deletions.
36 changes: 36 additions & 0 deletions client/js/controllers/MainCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,42 @@ angular.module('app')
label: "PC3",
color: "#ff0000",
visibility: 0
},{
label: "PC4",
color: "#00ff00",
visibility: 50
}, {
label: "PC5",
color: "#00f0ff",
visibility: 20
}, {
label: "PC6",
color: "#ff0f00",
visibility: 0
},{
label: "PC7",
color: "#f0ff00",
visibility: 90
}, {
label: "PC8",
color: "#d000ff",
visibility: 20
}, {
label: "PC9",
color: "#ff0ff0",
visibility: 5
},{
label: "PC10",
color: "#00ff0f",
visibility: 50
}, {
label: "PC11",
color: "#00ffff",
visibility: 100
}, {
label: "PC12",
color: "#ffff00",
visibility: 0
}];

$scope.barchart1 = {
Expand Down
12 changes: 6 additions & 6 deletions client/partials/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<textarea ng-model="scriptResultsRaw"></textarea>
</li>

<li class="breadcrumb">
<li class="breadcrumb" title=" this shows the json of the mouse clicks whcih can be converted into an array or vector in your favorite volume processing library">
Mouse mask:
<pre>
{{mouseMasks[mouseMasks.length -1] | json}}
</pre>
</li>

<li class="breadcrumb">
<table class="matrix">
<table title=" this matrix can be connected to the results data from the MainCtrl.js file" class="matrix">
<tbody>
<tr ng-repeat="row in matrix">
<td ng-repeat="column in row track by $index" contenteditable>
Expand All @@ -36,22 +36,22 @@
<li class="breadcrumb">
<ul class="unstyled">
<li ng-repeat="layer in layers">
<input type="range" ng-model="layer.visibility" max="100" min="0"/> {{layer.label}} Color: <input type="color" ng-model="layer.color" />{{layer.color}}
<input title="change the slider to change the transparency of the layer" type="range" ng-model="layer.visibility" max="100" min="0"/> {{layer.label}} Color: <input title="click on this and a color picker will appear so you can choose any color you would like for this layer" type="color" ng-model="layer.color" />{{layer.color}}
</li>
</ul>
</li>

<li class="breadcrumb">
<nvd3 options='barchart1.options' data='barchart1.data'></nvd3>
<nvd3 title=" this bar chart can be connected to the results data from the MainCtrl.js file" options='barchart1.options' data='barchart1.data'></nvd3>
</li>

<li class="breadcrumb">
<nvd3 options='scatterplot1.options' data='scatterplot1.data'></nvd3>
<nvd3 title=" this scatter plot can be connected to the results data from the MainCtrl.js file" options='scatterplot1.options' data='scatterplot1.data'></nvd3>
</li>

</ul>
</div>
<div class="col-sm-8" ng-include="partialUrl + '/dataTransformOrPipeline-view.html'" ng-controller="BenchmarkViewCtrl">
<div class="col-sm-8" ng-include="partialUrl + '/dataTransformOrPipeline-view.html'" ng-controller="BenchmarkViewCtrl" title="use your mouse to zoom in and out, click on the brain to rotate it in 3D space, use SHIFT+Click to trace a shape which can become verticies of a new volumn mask (the mask appears in a vector on the left side). This mask is passed to your scripts which can be used to filter the data ">
</div>
<!-- <div class="col-sm-1">
<ul class="list-unstyled">
Expand Down

0 comments on commit 0a91e7c

Please sign in to comment.