Skip to content
This repository
Browse code

sample height working now

  • Loading branch information...
commit 8300a0e8ea022e668166f54d7beb3a1e40a91b92 1 parent 5c2e554
Jeffrey Warren authored
6 webserver/app/views/capture/_configure.html.erb
@@ -25,9 +25,11 @@
25 25 <p><i>This panel is under construction</i></p>
26 26
27 27 <label for="samplerow-slider">Sample row height (zero = top):</label>
28   - <input type="range" name="samplerow-slider" id="samplerow-slider" value="240" min="0" max="480" onChange="$W.setSampleRows(parseInt($('#samplerow-slider').val()),parseInt($('#samplerow-slider').val())+40);$('#heightIndicator')[0].style.height = parseInt(($('#samplerow-slider').val()/480)*280)+'px';"/>
  28 + <input type="range" name="samplerow-slider" id="samplerow-slider" value="240" min="0" max="480" onChange="$W.setSampleRows(parseInt($('#samplerow-slider').val()),parseInt($('#samplerow-slider').val()));$('#heightIndicator')[0].style.height = parseInt(($('#samplerow-slider').val()/480)*240)+'px';"/>
29 29
30   - <div id="heightIndicator" style="position:absolute;z-index:999;opacity:0.4;background:#888;border-bottom:1px solid #ccc;height:120px;width:320px;"></div>
  30 + <br />
  31 +
  32 + <div id="heightIndicator" style="position:absolute;margin:0;z-index:999;opacity:0.4;background:#888;border-bottom:1px solid #ccc;height:120px;width:320px;"></div>
31 33 <div id="webcam"></div>
32 34 <a data-role="button" data-theme="a" href="#capture" data-panel="main">&laquo; Back</a>
33 35 </div>
2  webserver/public/javascripts/capture.js
@@ -56,7 +56,7 @@ $W = {
56 56 setInterval($W.alert_overexposure,3000)
57 57 $W.data = [{label: "webcam",data:[]}]
58 58 $('video')[0].width = "320"
59   - $('video')[0].height = "280"
  59 + $('video')[0].height = "240"
60 60 },
61 61 success: function (stream) {
62 62 //console.log('success')

0 comments on commit 8300a0e

Please sign in to comment.
Something went wrong with that request. Please try again.