AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add indicator for selected device and process

Browse source
This commit is contained in:
Stewart Allen 2019-03-30 17:22:38 -04:00
commit cc353b0fa3
3 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/kiri.js
View file

@ -1828,7 +1828,6 @@ self.kiri.license = exports.LICENSE;
// store camera view // store camera view
var view = SPACE.view.save(); var view = SPACE.view.save();
if (view.left || view.up) settings.controller.view = view; if (view.left || view.up) settings.controller.view = view;
SDB.setItem('ws-settings', JSON.stringify(settings)); SDB.setItem('ws-settings', JSON.stringify(settings));
} }
@ -2035,9 +2034,13 @@ self.kiri.license = exports.LICENSE;
} }
settings.process.processName = name; settings.process.processName = name;
settings.cproc[mode] = name; settings.cproc[mode] = name;
// associate named process with the current device // associate named process with the current device
settings.devproc[currentDeviceName()] = name; settings.devproc[currentDeviceName()] = name;
// update selection display
$('selected-process').innerHTML = name;
updateFields(); updateFields();
if (!named) { if (!named) {
hideDialog(); hideDialog();
@ -2986,6 +2989,7 @@ self.kiri.license = exports.LICENSE;
setDeviceCode(code, devicename); setDeviceCode(code, devicename);
}); });
} }
$('selected-device').innerHTML = devicename;
} }
function valueOf(val, dv) { function valueOf(val, dv) {

6
web/kiri/index.html
View file

@ -33,6 +33,12 @@
<div id="control-left" class="control"><div id="assets"></div></div> <div id="control-left" class="control"><div id="assets"></div></div>
<!-- right control menu --> <!-- right control menu -->
<div id="control-right" class="control"><div id="control"></div></div> <div id="control-right" class="control"><div id="control"></div></div>
<!-- selected device and print profiles -->
<div id="selected" class="control">
<span id="selected-device">???</span>
<span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>
<span id="selected-process">???</span>
</div>
<!-- all modal dialogs --> <!-- all modal dialogs -->
<div id="modal"> <div id="modal">
<div id="help"></div> <div id="help"></div>

26
web/kiri/style.css
View file

@ -635,3 +635,29 @@ button[import="1"] {
.fgro { .fgro {
flex-grow: 1; flex-grow: 1;
} }
#selected {
position: fixed;
z-index: 10000;
color: #eee;
bottom: 5px;
left: 0px;
padding: 5px;
border-top: 3px solid #ddd;
border-right: 3px solid #ddd;
border-bottom: 3px solid #ddd;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
background-color: rgba(255,255,255,0.75);
overflow: none;
display: flex;
flex-direction: row;
}
#selected > span {
font-family: sans-serif;
font-weight: normal;
font-size: 12px;
color: #555;
}