Commit 2d602c00 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

+ manual position/orientation dialog: inactive

parent bd0558f8
...@@ -295,6 +295,16 @@ html, body, #x3d_wrapper { ...@@ -295,6 +295,16 @@ html, body, #x3d_wrapper {
text-align:center; text-align:center;
} }
#window-extrainfo{
z-index: 10;
background: rgba(220,220,220,1);
border: 0px solid rgba(100,100,100,0.5);
border-radius: 1px;
color: black;
font-size: 16px;
margin-bottom: 2px;
}
#window-error{ #window-error{
z-index: 10; z-index: 10;
background: rgba(256,256,256,1); background: rgba(256,256,256,1);
......
...@@ -61,6 +61,7 @@ var SETTINGS = { ...@@ -61,6 +61,7 @@ var SETTINGS = {
'version': "", 'version': "",
'experimental': false, 'experimental': false,
'edit': false, 'edit': false,
'manualposor': false,
'files': { 'files': {
'x3d':"", 'x3d':"",
'kml':"" 'kml':""
...@@ -108,6 +109,8 @@ function parseURL(){ ...@@ -108,6 +109,8 @@ function parseURL(){
case "ver": SETTINGS.version = parameters[i][1]; break; case "ver": SETTINGS.version = parameters[i][1]; break;
case "edit": SETTINGS.edit = true; break; case "edit": SETTINGS.edit = true; break;
case "manualposor": SETTINGS.manualposor = true; break;
case "experimental": SETTINGS.experimental = true; break; case "experimental": SETTINGS.experimental = true; break;
// case "kml": SETTINGS.kml = parameters[i][1]; break; // case "kml": SETTINGS.kml = parameters[i][1]; break;
} }
......
...@@ -107,6 +107,7 @@ function menu_init(){ ...@@ -107,6 +107,7 @@ function menu_init(){
save_rating_init(); save_rating_init();
editmode_init(); editmode_init();
extra_models_init(); extra_models_init();
manualposor_init();
$("#global_coordinates").on('click',function(){ $("#global_coordinates").on('click',function(){
ui_hideMessage("window-markinfo"); ui_hideMessage("window-markinfo");
...@@ -291,6 +292,45 @@ function editmode_init(){ ...@@ -291,6 +292,45 @@ function editmode_init(){
} }
function manualposor_init(){
$("#window-extrainfo").html([
'<div>',
' <table id=\'mpr_table\'>',
' <tr>',
' <th></th>',
' <th colspan=\'3\'>position, m</th>',
' <th colspan=\'3\'>orientation, &deg;</th>',
' </tr>',
' <tr>',
' <th>Model</th>',
' <th>x</th>',
' <th>y</th>',
' <th>z</th>',
' <th>azimuth</th>',
' <th>elevation</th>',
' <th>skew</th>',
' </tr>',
' </table>',
'</div>'
].join('\n'));
if (SETTINGS.manualposor){
$("#window-extrainfo").show();
}else{
$("#window-extrainfo").hide();
}
$("#manualposor").on('click',function(){
if (SETTINGS.manualposor){
$("#window-extrainfo").show();
}else{
$("#window-extrainfo").hide();
}
});
}
function controls_showhide(){ function controls_showhide(){
if (!SETTINGS.experimental){ if (!SETTINGS.experimental){
......
...@@ -102,6 +102,7 @@ Instructions: ...@@ -102,6 +102,7 @@ Instructions:
<div id='window-error'></div> <div id='window-error'></div>
<div id='window-viewinfo'></div> <div id='window-viewinfo'></div>
<div id='window-markinfo'></div> <div id='window-markinfo'></div>
<div id='window-extrainfo'></div>
<div id='window-info'></div> <div id='window-info'></div>
</div> </div>
<div id='menu-content'> <div id='menu-content'>
...@@ -171,6 +172,10 @@ Instructions: ...@@ -171,6 +172,10 @@ Instructions:
<td title='Adjust initial location and orientation'>Edit mode</td> <td title='Adjust initial location and orientation'>Edit mode</td>
<td><input id='edit' type='checkbox' class='my-check-box donothide' /></td> <td><input id='edit' type='checkbox' class='my-check-box donothide' /></td>
</tr> </tr>
<tr class='edit' title='also works for multiple loaded models'>
<td>Manual position and orientation dialog</td>
<td><input id='manualposor' type='checkbox' class='my-check-box donothide' /></td>
</tr>
<tr class='edit'> <tr class='edit'>
<td title=''>Import coordinates from another model</td> <td title=''>Import coordinates from another model</td>
<td><input id='model_name' type='text' class='input donothide' placeholder='model name' /></td> <td><input id='model_name' type='text' class='input donothide' placeholder='model name' /></td>
......
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