Skip to content

Commit

Permalink
Update webHMI references to Lux / Loupe UX
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewMusser committed Nov 22, 2023
1 parent 4d218ba commit 8ad7697
Show file tree
Hide file tree
Showing 24 changed files with 71 additions and 71 deletions.
8 changes: 4 additions & 4 deletions example/HMI/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<script src="jquery/dist/jquery.min.js" onload="if('undefined' != typeof module) window.$ = window.jQuery = module.exports;"></script>
<script src="bootstrap/dist/js/bootstrap.min.js"></script>

<!-- include WebHMI -->
<script src="@loupeteam/webhmi/webhmi.js"></script>
<script src="@loupeteam/webhmi/webhmi-data-bind.js"></script>
<link href="@loupeteam/webhmi/webhmi.css" rel="stylesheet">
<!-- include Loupe UX -->
<script src="@loupeteam/loupe-ux/lux.js"></script>
<script src="@loupeteam/loupe-ux/lux-data-bind.js"></script>
<link href="@loupeteam/loupe-ux/lux.css" rel="stylesheet">

<!-- we require manually loading before the tmplit system handlebars -->
<script src="handlebars/dist/handlebars.min.js" ></script>
Expand Down
8 changes: 4 additions & 4 deletions example/HMI/index_public.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<script src="./node_modules/jquery/dist/jquery.min.js" onload="if('undefined' != typeof module) window.$ = window.jQuery = module.exports;"></script>
<script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>

<!-- include WebHMI -->
<script src="./node_modules/@loupeteam/webhmi/webhmi.js"></script>
<script src="./node_modules/@loupeteam/webhmi/webhmi-data-bind.js"></script>
<link href="./node_modules/@loupeteam/webhmi/webhmi.css" rel="stylesheet">
<!-- include Loupe UX -->
<script src="./node_modules/@loupeteam/loupe-ux/lux.js"></script>
<script src="./node_modules/@loupeteam/loupe-ux/lux-data-bind.js"></script>
<link href="./node_modules/@loupeteam/loupe-ux/lux.css" rel="stylesheet">

<!-- handlebars -->
<script src="./node_modules/handlebars/dist/handlebars.min.js" ></script>
Expand Down
2 changes: 1 addition & 1 deletion example/HMI/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@loupeteam/tmplits-text": "file:../../src/tmplits/tmplits-text/",
"@loupeteam/tmplits-utilities": "file:../../src/tmplits/tmplits-utilities/",
"@loupeteam/tmplits-valueupdown": "file:../../src/tmplits/tmplits-valueupdown/",
"@loupeteam/webhmi": "*",
"@loupeteam/loupe-ux": "*",
"app": "file:./",
"bootstrap": "^3.3.4",
"handlebars": "*",
Expand Down
4 changes: 2 additions & 2 deletions example/HMI/src/app.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine = new WEBHMI.Machine({
machine = new LUX.Machine({
port: 8000,
ipAddress: '127.0.0.1',
maxReconnectCount: 5000
});
setInterval(WEBHMI.updateHMI,30)
setInterval(LUX.updateHMI,30)
6 changes: 3 additions & 3 deletions example/HMI/views/main.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ Custom User Controls:
{{> 'button-label'
label=(Partial "custom-icon" img="app/assets/wireframe.png")
data-var-name='tmplitTest:tmplit.SetButton'
class='webhmi-hide'
class='lux-hide'
}}

{{> 'button-icon'
img="app/assets/wireframe.png"
data-var-name='tmplitTest:tmplit.SetButton'
class='webhmi-hide'
class='lux-hide'
}}

{{> 'icon'
img="app/assets/wireframe.png"
data-var-name='tmplitTest:tmplit.SetButton'
class='webhmi-btn-set webhmi-hide'
class='lux-btn-set lux-hide'
}}


Expand Down
24 changes: 12 additions & 12 deletions src/HMI/tmplits.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,10 @@ export class Tmplits {
catch(e){
$(dom).html(`<div class="error">Error loading the page '${pageName}' ${e} </div>` )
}
if( typeof WEBHMI !== 'undefined'){
if( typeof LUX !== 'undefined'){
try {
WEBHMI.queryDom()
WEBHMI.updateHMI()
LUX.queryDom()
LUX.updateHMI()
} catch (error) {

}
Expand All @@ -357,10 +357,10 @@ export class Tmplits {
catch(e){
$(container).html(`<div class="error">Error loading the template '${template}' ${e} </div>`)
}
if( typeof WEBHMI !== 'undefined'){
if( typeof LUX !== 'undefined'){
try {
WEBHMI.queryDom()
WEBHMI.updateHMI()
LUX.queryDom()
LUX.updateHMI()
}catch{}
}
}
Expand Down Expand Up @@ -584,11 +584,11 @@ export class Tmplits {
export class viewDelegate {
constructor() {}
// static observer = new MutationObserver(function (mutations) {
// // Was a new webhmi element added to the DOM?
// // Use Array.some() instead of Array.forEach() for easy loop break when we find a webhmi element added or remove from DOM
// // Was a new lux element added to the DOM?
// // Use Array.some() instead of Array.forEach() for easy loop break when we find a lux element added or remove from DOM
// let nodes = new Array()
// mutations.forEach(function (mutation) {
// // check added nodes for webhmi changes
// // check added nodes for lux changes
// mutation.addedNodes.forEach(function (node) {
// if (node.nodeType == node.ELEMENT_NODE) {
// // check elem, check descendants
Expand Down Expand Up @@ -663,10 +663,10 @@ export class viewDelegate {
el.forEach((el) => {
let fn = e.fn()
el.innerHTML = fn
if( typeof WEBHMI !== 'undefined'){
if( typeof LUX !== 'undefined'){
try{
WEBHMI.queryDom()
WEBHMI.updateHMI()
LUX.queryDom()
LUX.updateHMI()
}
catch{}
}
Expand Down
8 changes: 4 additions & 4 deletions src/template-hmi/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
<script src="jquery/dist/jquery.min.js" onload="if('undefined' != typeof module) window.$ = window.jQuery = module.exports;"></script>
<script src="bootstrap/dist/js/bootstrap.min.js"></script>

<!-- include WebHMI -->
<script src="@loupeteam/webhmi/webhmi.js"></script>
<script src="@loupeteam/webhmi/webhmi-data-bind.js"></script>
<link href="@loupeteam/webhmi/webhmi.css" rel="stylesheet">
<!-- include Loupe UX -->
<script src="@loupeteam/loupe-ux/lux.js"></script>
<script src="@loupeteam/loupe-ux/lux-data-bind.js"></script>
<link href="@loupeteam/loupe-ux/lux.css" rel="stylesheet">

<!-- we require manually loading before the tmplit system handlebars -->
<script src="handlebars/dist/handlebars.js" ></script>
Expand Down
8 changes: 4 additions & 4 deletions src/template-hmi/index_public.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
<script src="./node_modules/jquery/dist/jquery.min.js" onload="if('undefined' != typeof module) window.$ = window.jQuery = module.exports;"></script>
<script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>

<!-- include WebHMI -->
<script src="./node_modules/@loupeteam/webhmi/webhmi.js"></script>
<script src="./node_modules/@loupeteam/webhmi/webhmi-data-bind.js"></script>
<link href="./node_modules/@loupeteam/webhmi/webhmi.css" rel="stylesheet">
<!-- include Loupe UX -->
<script src="./node_modules/@loupeteam/loupe-ux/lux.js"></script>
<script src="./node_modules/@loupeteam/loupe-ux/lux-data-bind.js"></script>
<link href="./node_modules/@loupeteam/loupe-ux/lux.css" rel="stylesheet">

<!-- handlebars -->
<script src="./node_modules/handlebars/dist/handlebars.min.js" ></script>
Expand Down
2 changes: 1 addition & 1 deletion src/template-hmi/package-template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@loupeteam/webhmi": "*",
"@loupeteam/loupe-ux": "*",
"@loupeteam/tmplits": "*",
"@loupeteam/tmplit-basic": "*",
"app":"file:./",
Expand Down
4 changes: 2 additions & 2 deletions src/template-hmi/src/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
*/

machine = new WEBHMI.Machine({
machine = new LUX.Machine({
port: 8000,
ipAddress: '127.0.0.1',
maxReconnectCount: 5000
});
setInterval(WEBHMI.updateHMI,30)
setInterval(LUX.updateHMI,30)
4 changes: 2 additions & 2 deletions src/tmplits/tmplits-checkbox/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function TmplitCheckBox(context, args) {
if (buttonVarName == '') {
buttonVarName = dataVarName
classList.splice(classList.findIndex((e) => {
return e == 'webhmi-led'
return e == 'lux-led'
}),1)
}
attr += `data-var-name='${buttonVarName}'`
Expand All @@ -72,7 +72,7 @@ export function TmplitCheckBox(context, args) {
return `
<div class="${classList.join(' ')}" ${attr}>
<div class='' data-var-name='${dataVarName}' ${attr}></div>
<span class="glyphicon webhmi-led" data-led-true='glyphicon-check' data-led-false='glyphicon-unchecked' data-var-name='${dataVarName}' style='font-size:20px;'></span>
<span class="glyphicon lux-led" data-led-true='glyphicon-check' data-led-false='glyphicon-unchecked' data-var-name='${dataVarName}' style='font-size:20px;'></span>
${label}
</div>
`
Expand Down
2 changes: 1 addition & 1 deletion src/tmplits/tmplits-directorybrowser/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function TmplitDirectoryBrowser( context, args){
}
delete args.hash['data-var-name']
args.hash.set = false
args.children += `<invisible-input style='display:none' class='webhmi-text-value lui-directory-data' data-var-name='${dataVarNameFiles}'></invisible-input>`
args.children += `<invisible-input style='display:none' class='lux-text-value lui-directory-data' data-var-name='${dataVarNameFiles}'></invisible-input>`
return `
${TmplitDropdownTable( context, args )}
`
Expand Down
2 changes: 1 addition & 1 deletion src/tmplits/tmplits-directorybrowserwindow/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function TmplitDirectoryBrowserWindow( context, args){
}
delete args.hash['data-var-name']
args.hash.set = false
args.children += `<invisible-input style='display:none' class='webhmi-text-value lui-directory-data' data-var-name='${dataVarNameFiles}'></invisible-input><dropdown>No Data</dropdown>`
args.children += `<invisible-input style='display:none' class='lux-text-value lui-directory-data' data-var-name='${dataVarNameFiles}'></invisible-input><dropdown>No Data</dropdown>`
return `
<div style='width:100%;height:100%;'>
${TmplitTableSelect( context, args )}
Expand Down
8 changes: 4 additions & 4 deletions src/tmplits/tmplits-dropdown/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ or we will assume one for you..
Example drop down usage:
{{#tmplit 'dropdown' [set=false/true]}}
<field>
<input placeholder="Select Operation" class='webhmi-dropdown'/>
<input placeholder="Select Operation" class='lux-dropdown'/>
</field>
<dropdown>
<div></div>
Expand Down Expand Up @@ -113,10 +113,10 @@ export function TmplitDropdown(context, args) {
}
}
if (field == '') {
field = `<input ${dataVarNameField ? 'data-var-name="' + dataVarNameField + '"' : '' } class='form-control${set ?"":' noset'} lui-select-text${dataVarNameField ? ' webhmi-text-value' : ''}'>`
field = `<input ${dataVarNameField ? 'data-var-name="' + dataVarNameField + '"' : '' } class='form-control${set ?"":' noset'} lui-select-text${dataVarNameField ? ' lux-text-value' : ''}'>`
}
if( dataVarName ){
field += `<invisible-input class='webhmi-num-value lui-select-value' style='display:none' data-var-name='${dataVarName}' ></invisible-input>`
field += `<invisible-input class='lux-num-value lui-select-value' style='display:none' data-var-name='${dataVarName}' ></invisible-input>`
}
let delegate = args.delegate ? `onclick="${args.delegate}?.willOpen?.();"` : ''

Expand All @@ -134,7 +134,7 @@ export function TmplitDropdown(context, args) {
<div class="input-group-btn">
<button type="button"
${willOpenButton}
class="btn dropdown-toggle${willOpenPV ? " webhmi-btn-set" : ''}" ${willOpenPV ? "data-var-name='" + willOpenPV +"'" : ''} data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
class="btn dropdown-toggle${willOpenPV ? " lux-btn-set" : ''}" ${willOpenPV ? "data-var-name='" + willOpenPV +"'" : ''} data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</button>
<div class="dropdown-menu" >
Expand Down
6 changes: 3 additions & 3 deletions src/tmplits/tmplits-dropdowntable/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ export function TmplitDropdownTable(context, args) {
}

if( field == '') {
field = `<input ${dataVarNameField ? 'data-var-name="' + dataVarNameField + '"' : '' } class='form-control${set ?"":' noset'} lui-select-text${dataVarNameField ? ' webhmi-text-value' : ''}'>`
field = `<input ${dataVarNameField ? 'data-var-name="' + dataVarNameField + '"' : '' } class='form-control${set ?"":' noset'} lui-select-text${dataVarNameField ? ' lux-text-value' : ''}'>`
}
if( dataVarName ){
field += `<invisible-input class='webhmi-text-value lui-select-value' style='display:none' data-var-name='${dataVarName}' ></invisible-input>`
field += `<invisible-input class='lux-text-value lui-select-value' style='display:none' data-var-name='${dataVarName}' ></invisible-input>`
}

let delegate = args.delegate ? `onclick="${args.delegate}?.willOpen?.()"` : ''
Expand All @@ -130,7 +130,7 @@ export function TmplitDropdownTable(context, args) {
<div class="input-group-btn">
<button type="button"
${delegate}
class="btn dropdown-toggle${willOpenPV ? " webhmi-btn-set" : ''}" ${willOpenPV ? "data-var-name='" + willOpenPV +"'" : ''} data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
class="btn dropdown-toggle${willOpenPV ? " lux-btn-set" : ''}" ${willOpenPV ? "data-var-name='" + willOpenPV +"'" : ''} data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</button>
<div class="dropdown-menu" >
Expand Down
4 changes: 2 additions & 2 deletions src/tmplits/tmplits-globalclasses/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export class LuiSlider {
let value;
if (target?.[0].getAttribute('data-var-name')) {
try{
value = WEBHMI.getValue($(target?.[0]))
value = LUX.getValue($(target?.[0]))
}
catch(e){
value = +target?.[0].value
Expand Down Expand Up @@ -575,7 +575,7 @@ export function luiIncrementValue(selected) {
}
let value;
if (target?.[0].getAttribute('data-var-name')) {
value = WEBHMI.getValue($(target?.[0]))
value = LUX.getValue($(target?.[0]))
} else {
value = +target?.[0].value
}
Expand Down
4 changes: 2 additions & 2 deletions src/tmplits/tmplits-led/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function TmplitLed(context, args) {
if (buttonVarName == '') {
buttonVarName = dataVarName
classList.splice(classList.findIndex((e) => {
return e == 'webhmi-led'
return e == 'lux-led'
}),1)
}
attr += `data-var-name='${buttonVarName}'`
Expand All @@ -81,7 +81,7 @@ export function TmplitLed(context, args) {

return `
<div class="${classList.join(' ')}" ${attr}>
<div class='led webhmi-led' data-led-false='led-off' data-led-true='${error ? 'led-red': (warning ? 'led-yellow':'led-green') }' data-var-name='${dataVarName}' ${attr}></div>
<div class='led lux-led' data-led-false='led-off' data-led-true='${error ? 'led-red': (warning ? 'led-yellow':'led-green') }' data-var-name='${dataVarName}' ${attr}></div>
${label}
</div>
`
Expand Down
4 changes: 2 additions & 2 deletions src/tmplits/tmplits-multiselect/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ export function TmplitMultiSelect(context, args) {
}

if(dataVarName){
options += `<invisible-input class="lui-select-value webhmi-num-value" style="display:none" value="${context}" ${dataVarName?'data-var-name="' + dataVarName +'"':''} ></invisible-input>`
options += `<invisible-input class="lui-select-value lux-num-value" style="display:none" value="${context}" ${dataVarName?'data-var-name="' + dataVarName +'"':''} ></invisible-input>`
}
if(dataVarNameField){
options += `<invisible-input class="lui-select-text webhmi-text-value" style="display:none" value="${context}" ${dataVarNameField?'data-var-name="' + dataVarNameField +'"':''} ></invisible-input>`
options += `<invisible-input class="lui-select-text lux-text-value" style="display:none" value="${context}" ${dataVarNameField?'data-var-name="' + dataVarNameField +'"':''} ></invisible-input>`
}

args.children = options
Expand Down
4 changes: 2 additions & 2 deletions src/tmplits/tmplits-numeric/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ export function TmplitNumeric(context, args) {

let field = ''
if (type === 'output'){
field = `<div class='form-control webhmi-num-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}></div>`
field = `<div class='form-control lux-num-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}></div>`
} else if (type === 'input'){
field = `<input class='form-control webhmi-num-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}/>`
field = `<input class='form-control lux-num-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}/>`
}

return `
Expand Down
2 changes: 1 addition & 1 deletion src/tmplits/tmplits-slider/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function TmplitSlider(context, args) {
inputStyle = `position:relative;width:150%;top:0%;border-style:none;background:transparent;display:none` + inputStyle
let innerClassList = ['lui-slider-value']
if (dataVarName) {
innerClassList.push('webhmi-num-value')
innerClassList.push('lux-num-value')
}
let inner = '';
if (args.children) {
Expand Down
6 changes: 3 additions & 3 deletions src/tmplits/tmplits-tableselect/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ export function TmplitTableSelect(context, args) {
}
}
if (field == '') {
field = `<input ${dataVarNameField ? 'data-var-name="' + dataVarNameField + '"' : '' } class='${set ?"":' noset'} lui-select-text${dataVarNameField ? ' webhmi-text-value' : ''} list-viewer-selected-file-name'>`
field = `<input ${dataVarNameField ? 'data-var-name="' + dataVarNameField + '"' : '' } class='${set ?"":' noset'} lui-select-text${dataVarNameField ? ' lux-text-value' : ''} list-viewer-selected-file-name'>`
}
if( dataVarName ){
field += `<invisible-input class='webhmi-num-value lui-select-value list-viewer-selected-file-name' style='display:none' data-var-name='${dataVarName}' ></invisible-input>`
field += `<invisible-input class='lux-num-value lui-select-value list-viewer-selected-file-name' style='display:none' data-var-name='${dataVarName}' ></invisible-input>`
}
let delegate = args.delegate ? `onclick="${args.delegate}?.willOpen?.();"` : ''

Expand All @@ -104,7 +104,7 @@ export function TmplitTableSelect(context, args) {
${field}
<button type="button"
${willOpenButton}
class="input-group-addon dropdown-toggle${willOpenPV ? " webhmi-btn-set" : ''} list-viewer-refresh-button" ${willOpenPV ? "data-var-name='" + willOpenPV +"'" : ''} data-toggle="dropdown" aria-hidden="true">
class="input-group-addon dropdown-toggle${willOpenPV ? " lux-btn-set" : ''} list-viewer-refresh-button" ${willOpenPV ? "data-var-name='" + willOpenPV +"'" : ''} data-toggle="dropdown" aria-hidden="true">
<span class="glyphicon glyphicon-refresh"></span>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/tmplits/tmplits-text/module.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ export function TmplitText(context, args) {

let field = ''
if (type === 'output'){
field = `<div class='form-control webhmi-text-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}></div>`
field = `<div class='form-control lux-text-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}></div>`
} else if (type === 'input'){
field = `<input class='form-control webhmi-text-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}/>`
field = `<input class='form-control lux-text-value' ${dataVarName ? 'data-var-name="' + dataVarName + '"' : '' } ${attr}/>`
}

return `
Expand Down
Loading

0 comments on commit 8ad7697

Please sign in to comment.