Skip to content

Commit

Permalink
wip/brk: adding voxel painting
Browse files Browse the repository at this point in the history
  • Loading branch information
akeshavan committed Aug 14, 2016
1 parent d62c74d commit 4e53f09
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 251 deletions.
1 change: 1 addition & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ flowkey:hotkeys
chriswessels:hammer
tmeasday:presence
check
fortawesome:fontawesome
1 change: 1 addition & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ [email protected]
[email protected]
[email protected]
flowkey:[email protected]
fortawesome:[email protected]
[email protected]
[email protected]
[email protected]
Expand Down
5 changes: 5 additions & 0 deletions imports/python_generate/generator.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
],
"graph_type": "histogram",
"colormaps": {
"0":{"name": "Grayscale",
"alpha": 1,
"min": 0,
"max": 255
},
"1": {
"name": "custom.Freesurfer",
"alpha": 0.5
Expand Down
6 changes: 6 additions & 0 deletions imports/ui/body.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,10 @@

</body>

<template name="tasks">

{{> tabular table=TabularTables.task selector=selector class="table table-striped table-bordered table-condensed"}}

</template>


33 changes: 33 additions & 0 deletions imports/ui/qc.html
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,40 @@ <h4 class="panel-title">
</div>
</div>
</li>
<li>
<div class="panel panel-{{modeCSS.paintColor}}">
<div class="panel-heading">
<!--<h4 class="panel-title" > -->
<table>
<th>Painter</th>
<th><a data-toggle="collapse" data-target="#collapseP"> <span class="glyphicon glyphicon-menu-down" aria-hidden="true"></span></a></th>
<th><a><span class="glyphicon glyphicon-pencil swapmode paint"></span></a> </th>
<th>{{paintValue}}</th>
</table>
<!--</h4>-->
</div>
<div id="collapseP" class="panel-collapse collapse" role="tabpanel">
<div class="panel-body">


<form class="form-inline">
<div class="form-group">
<!--<label class="sr-only" for="exampleInputAmount">Amount (in dollars)</label>-->
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-paint-brush"></i></div>
<input type="text" class="form-control" id="paintValue" placeholder="Paint Value" value="{{paintValue}}">
<!--<div class="input-group-addon">.00</div>-->
</div>
</div>
<button type="button" class="btn btn-default btn-small" id="paintEraser"><span class="glyphicon glyphicon-erase"></span></button>
<button type="button" class="btn btn-default btn-small" id="paintPicker"><span class="fa fa-eyedropper"></span></button>
</form>

</div>
<div class="panel-footer">Shift+click & drag to paint curves.</div>
</div>
</div>
</li>

<li>
<div class="panel panel-default">
Expand Down
Loading

0 comments on commit 4e53f09

Please sign in to comment.