Commit c55e2dce authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

ray info and link to project src

parent ae4363a6
......@@ -78,6 +78,19 @@ input{
top:74px;
}
#info{
position: absolute;
left:1014;
top:225px;
}
#srccode{
position: absolute;
left:925px;
top:5px;
z-index:3;
}
.remove_button{
font-size: 16px;
margin: 0px;
......
......@@ -50,10 +50,10 @@ Copyright (C) 2014 Elphel, Inc.
<td>Aperture<span style="font-size:0.8em"> (Dia)</span>, <span style="font-size:0.8em">mm</span></td>
<td width=100 >R<span style="font-size:0.8em">(curve)</span>, <span style="font-size:0.8em">mm</span></td>
<td width=100 >&kappa;</td>
<td width=100 >&alpha;<span style="font-size:0.6em">1</span></td>
<td width=100 >&alpha;<span style="font-size:0.6em">2</span></td>
<td width=100 >&alpha;<span style="font-size:0.6em">3</span></td>
<td width=95 >&alpha;<span style="font-size:0.6em">4</span></td>
<td width=100 >&alpha;<span style="font-size:0.8em"><sub>1</sub>&nbsp;(r<sup>2</sup>)</span></td>
<td width=100 >&alpha;<span style="font-size:0.8em"><sub>2</sub>&nbsp;(r<sup>4</sup>)</span></td>
<td width=100 >&alpha;<span style="font-size:0.8em"><sub>3</sub>&nbsp;(r<sup>6</sup>)</span></td>
<td width=95 >&alpha; <span style="font-size:0.8em"><sub>4</sub>&nbsp;(r<sup>8</sup>)</span></td>
<td><button class='plus_button' onclick="element_add_button()"><b>+</b></button></td>
</tr>
</table>
......@@ -91,5 +91,20 @@ Copyright (C) 2014 Elphel, Inc.
</tr>
</table>
</div>
<div id="info">
<table style="border:0px">
<tr>
<td style="text-align:left">Chief rays width, <span style="font-size:0.8em">mm</span></td>
<td style="text-align:left"><div id="crw"></div></td>
</tr>
<tr>
<td style="text-align:left">Marginal ray angle, <span style="font-size:0.8em">&deg;</span></td>
<td style="text-align:left"><div id="mra"></div></td>
</tr>
</table>
</div>
<div id='srccode'>
<a href='https://github.com/Elphel/optical-design-viewer'>source code</a>
</div>
</body>
</html>
\ No newline at end of file
......@@ -636,7 +636,11 @@ function rays_draw(){
//step1!
var hh1 = find_marginal_ray_half_height(0,0,0,0.1,old_cv,100);
$("#crw").html(Math.round(2*hh1*1000)/1000);
var c1 = find_aperture_stop_ray(x,y,alpha,0,dalpha,old_cv,100);
var tmp = (c1[2]>90)?(c1[2]-180):(c1[2]);
tmp=Math.round(tmp*1000)/1000;
$("#mra").html(tmp);
var step = +2*hh1/(n-1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment