Permalink
Browse files

Merge branch 'master' of https://github.com/jywarren/spectral-workbench

  • Loading branch information...
2 parents 5142e64 + 5e0265c commit 0dd07058a76153a35f2fc3bc73f873a90dd588ca @jywarren committed Jun 28, 2012
Showing with 5 additions and 1 deletion.
  1. +4 −0 webserver/app/views/spectrums/capture.html.erb
  2. +1 −1 webserver/public/javascripts/capture.js
@@ -26,6 +26,8 @@
<div style="display:none;" id="webcam"></div>
+<input type="text" id="sample_row" value="240" />
+
</div>
<script> (function () {
@@ -58,6 +60,8 @@
<input name="spectrum[title]" id="spectrum_notes" type="text" /><br />
<label for="spectrum_notes">Notes:</label><br />
<input name="spectrum[notes]" id="spectrum_notes" type="text" /><br />
+ <label for="tags">Tags:</label><br />
+ <input name="tags" id="spectrum_tags" value="webclient," type="text" /><br />
<input name="dataurl" type="hidden" id="dataurl" />
<input type="submit" value="Save" />
</form>
@@ -113,7 +113,7 @@ $W = {
getRow: function(y) {
if ($W.options.context === 'webrtc') {
var video = document.getElementsByTagName('video')[0];
- var startrow = parseInt($W.options.height/2)
+ var startrow = $('#sample_row').val()//parseInt($W.options.height/2)
$W.ctx.drawImage(video, 0, -startrow);
} else if($W.options.context === 'flash'){
window.webcam.capture();

0 comments on commit 0dd0705

Please sign in to comment.