Skip to content

O
optical-design-viewer
Commit 6c548ed3 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

formatting

parent 7b531c9a
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 40 deletions
index.css
View file @ 6c548ed3
...@@ -37,6 +37,7 @@ button { ...@@ -37,6 +37,7 @@ button {
table { table {
border: 1px solid rgba(200,200,200,1); border: 1px solid rgba(200,200,200,1);
border-collapse:collapse; border-collapse:collapse;
/*background: rgba(200,200,200,0.6);*/
} }
#elements_table_header, #controls_table, #ray_draw_table{ #elements_table_header, #controls_table, #ray_draw_table{
...@@ -82,14 +83,14 @@ input{ ...@@ -82,14 +83,14 @@ input{
#links{ #links{
position: absolute; position: absolute;
left:1014; left:1010;
top:74px; top:74px;
} }
#info{ #info{
position: absolute; position: absolute;
left:1014; left:1010;
top:225px; top:225px;
} }
#srccode{ #srccode{
...@@ -122,7 +123,16 @@ input{ ...@@ -122,7 +123,16 @@ input{
} }
#elements_table{ #elements_table{
padding: 0px 0px 0px 0px; /*padding: 5px 5px 5px 5px;*/
background: rgba(200,200,200,0.6); background: rgba(200,200,200,0.6);
} }
#links table, #info table{
border:0px;
background: white;
}
#info td, #links td{
width: 120px;
text-align:left;
}
index.html
View file @ 6c548ed3
...@@ -40,19 +40,18 @@ Copyright (C) 2014 Elphel, Inc. ...@@ -40,19 +40,18 @@ Copyright (C) 2014 Elphel, Inc.
<div id="elements_table_header_div"> <div id="elements_table_header_div">
<table id="elements_table_header"> <table id="elements_table_header">
<tr id="header"> <tr id="header">
<td><div style="width:16px;">#</div></td> <td width=16><div style="width:16px;">#</div></td>
<td width=100 >Distance, <span style="font-size:0.8em">mm</span></td> <td width=100 >Distance, <span style="font-size:0.8em">mm</span></td>
<td width=100 >Thickness, <span style="font-size:0.8em">mm</span></td> <td width=100 >Thickness, <span style="font-size:0.8em">mm</span></td>
<td width=100 >Material</td> <td width=100 >Material</td>
<td width=100 >Comment</td> <td width=100 >Comment</td>
<td width=24></td> <td colspan=2 width=137>Aperture<span style="font-size:0.8em"> (Dia)</span>, <span style="font-size:0.8em">mm</span></td>
<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 >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 >&kappa;</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>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>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=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 width=100 >&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> <td><button class='plus_button' onclick="element_add_button()"><b>+</b></button></td>
</tr> </tr>
</table> </table>
...@@ -75,30 +74,31 @@ Copyright (C) 2014 Elphel, Inc. ...@@ -75,30 +74,31 @@ Copyright (C) 2014 Elphel, Inc.
</tr> </tr>
<tr> <tr>
<td><button onclick="rays_draw()">Draw rays</button></td> <td><button onclick="rays_draw()">Draw rays</button></td>
<td></td>
</tr> </tr>
</table> </table>
</div> </div>
<div id="links"> <div id="links">
<table style="border:0px"> <table>
<tr> <tr>
<td width=120 style="text-align:left"><div id="link_local"></div></td> <td><div id="link_local"></div></td>
<td width=120 style="text-align:left"><div id="link_remote"></div></td> <td><div id="link_remote"></div></td>
</tr> </tr>
<tr> <tr>
<td width=120 style="text-align:left"><div id="link"></div></td> <td><div id="link"></div></td>
<td width=120 style="text-align:left"><div id="link_dl"></div></td> <td><div id="link_dl"></div></td>
</tr> </tr>
</table> </table>
</div> </div>
<div id="info"> <div id="info">
<table style="border:0px"> <table>
<tr> <tr>
<td style="text-align:left">Rays width, <span style="font-size:0.8em">mm</span></td> <td>Rays width, <span style="font-size:0.8em">mm</span></td>
<td style="text-align:left"><div id="crw"></div></td> <td><div id="crw"></div></td>
</tr> </tr>
<tr> <tr>
<td style="text-align:left">Field ray angle, <span style="font-size:0.8em">&deg;</span></td> <td>Field ray angle, <span style="font-size:0.8em">&deg;</span></td>
<td style="text-align:left"><div id="mra"></div></td> <td><div id="mra"></div></td>
</tr> </tr>
</table> </table>
</div> </div>
......
lens_design.js
View file @ 6c548ed3
...@@ -149,7 +149,7 @@ function table_update_all(){ ...@@ -149,7 +149,7 @@ function table_update_all(){
html += "\t\t<td><input type='text' id='name' value='"+e[i].name+"'\></td>\n"; html += "\t\t<td><input type='text' id='name' value='"+e[i].name+"'\></td>\n";
//aperture stop if <0 //aperture stop if <0
if (e[i].front.h>=0) { if (e[i].front.h>=0) {
html += "\t<td><span style='font-size:0.8em;'>front</span></td>\n"; html += "\t<td width=26><span style='font-size:0.8em;'>front</span></td>\n";
html += "\t\t<td><input type='text' id='front_height' value='"+e[i].front.h+"'\></td>\n"; html += "\t\t<td><input type='text' id='front_height' value='"+e[i].front.h+"'\></td>\n";
html += "\t\t<td><input type='text' id='front_curve' value='"+e[i].front.c+"'\></td>\n"; html += "\t\t<td><input type='text' id='front_curve' value='"+e[i].front.c+"'\></td>\n";
html += "\t\t<td><input type='text' id='front_k' value='"+e[i].front.k+"'\></td>\n"; html += "\t\t<td><input type='text' id='front_k' value='"+e[i].front.k+"'\></td>\n";
...@@ -166,13 +166,14 @@ function table_update_all(){ ...@@ -166,13 +166,14 @@ function table_update_all(){
} }
html += "\t\t<td><button class='remove_button'><b>&ndash;</b></button></td>\n"; html += "\t\t<td><button class='remove_button'><b>&ndash;</b></button></td>\n";
html += "\t</tr>\n"; html += "\t</tr>\n";
html += "\t<tr>\n"; html += "\t<tr>\n";
html += "\t<td></td>\n"; html += "\t<td></td>\n";
html += "\t<td></td>\n"; html += "\t<td></td>\n";
html += "\t<td></td>\n"; html += "\t<td></td>\n";
html += "\t<td></td>\n"; html += "\t<td></td>\n";
html += "\t<td></td>\n"; html += "\t<td></td>\n";
html += "\t<td><span style='font-size:0.8em;'>back</span></td>\n"; html += "\t<td width=26><span style='font-size:0.8em;'>back</span></td>\n";
html += "\t<td><input type='text' id='back_height' value='"+e[i].back.h+"'\></td>\n"; html += "\t<td><input type='text' id='back_height' value='"+e[i].back.h+"'\></td>\n";
html += "\t<td><input type='text' id='back_curve' value='"+e[i].back.c+"'\></td>\n"; html += "\t<td><input type='text' id='back_curve' value='"+e[i].back.c+"'\></td>\n";
html += "\t<td><input type='text' id='back_k' value='"+e[i].back.k+"'\></td>\n"; html += "\t<td><input type='text' id='back_k' value='"+e[i].back.k+"'\></td>\n";
...@@ -187,15 +188,16 @@ function table_update_all(){ ...@@ -187,15 +188,16 @@ function table_update_all(){
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
} }
html += "\t<td></td>\n";
}else{//aperture case }else{//aperture case
html += "\t\t<td width=24 ></td>\n"; html += "\t\t<td width=26></td>\n";
html += "\t\t<td><input type='text' id='front_height' value='"+e[i].front.h+"'\></td>\n"; html += "\t\t<td><input type='text' id='front_height' value='"+e[i].front.h+"'\></td>\n";
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td width=100 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td width=102 ></td>\n"; html += "\t\t<td width=100 ></td>\n";
html += "\t\t<td><button class='remove_button'><b>&ndash;</b></button></td>\n"; html += "\t\t<td><button class='remove_button'><b>&ndash;</b></button></td>\n";
} }
html += "\t</tr>\n"; html += "\t</tr>\n";
...@@ -210,24 +212,10 @@ function table_update_all(){ ...@@ -210,24 +212,10 @@ function table_update_all(){
}); });
//bind onchange //bind onchange
for(var i=0;i<e.length;i++){ for(var i=0;i<e.length;i++){
$("#element_"+e[i].id).find("#distance").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#thickness").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));}); $("#element_"+e[i].id).find("input").each(function(){
$("#element_"+e[i].id).find("#material").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));}); $(this).change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"))});
$("#element_"+e[i].id).find("#name").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));}); });
$("#element_"+e[i].id).find("#front_height").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#front_curve").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#front_k").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#front_a1").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#front_a2").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#front_a3").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#front_a4").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_height").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_curve").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_k").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_a1").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_a2").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_a3").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#back_a4").change(function(){element_onchange_redraw($(this).parent().parent().parent().parent().attr("value"));});
$("#element_"+e[i].id).find("#number").click(function(event){ $("#element_"+e[i].id).find("#number").click(function(event){
//enable_deselect=false; //enable_deselect=false;
......
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