Compare commits
No commits in common. "847fd0562ecfc43ee39a69e6c72b169e6b9f763e" and "ebfb47932e92fbea9fddb89acf3c3436fff9507c" have entirely different histories.
847fd0562e
...
ebfb47932e
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
||||
.*swp*
|
||||
*__pycache__
|
||||
www/config.js
|
||||
|
||||
@ -6,8 +6,6 @@ wwwip = 192.168.2.43
|
||||
nozoscip = 127.0.0.1
|
||||
bhoroscip = 127.0.0.1
|
||||
autostart = artnet
|
||||
wstype = ws
|
||||
wsport = 9001
|
||||
|
||||
[laser0]
|
||||
color = -1
|
||||
|
||||
30
configure.py
30
configure.py
@ -7,6 +7,7 @@ v0.1.0
|
||||
|
||||
A console friendly interface to change important parameters
|
||||
|
||||
|
||||
LICENCE : CC
|
||||
'''
|
||||
|
||||
@ -14,27 +15,8 @@ import configparser
|
||||
from libs3 import gstt
|
||||
import ast
|
||||
import numpy as np
|
||||
import os, sys
|
||||
import fileinput
|
||||
from shutil import copyfile
|
||||
ljpath = r'%s' % os.getcwd().replace('\\','/')
|
||||
import updateUI
|
||||
|
||||
def updateJSConfig(config):
|
||||
global ljpath
|
||||
wwwip = config.get('General','wwwip')
|
||||
wstype = config.get('General','wstype')
|
||||
wsport = config.get('General','wsport')
|
||||
# copy template
|
||||
src = ljpath + "/templates/config.js"
|
||||
dst = ljpath + "/www/config.js"
|
||||
copyfile(src, dst)
|
||||
# Interpolate variables
|
||||
with fileinput.FileInput(dst, inplace=True) as file:
|
||||
for line in file:
|
||||
line = line.replace("%wstype%", wstype)
|
||||
line = line.replace("%wsport%", wsport)
|
||||
line = line.replace("%wwwip%", wwwip)
|
||||
print(line, end='')
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
config.read(gstt.ConfigName)
|
||||
@ -42,8 +24,6 @@ config.read(gstt.ConfigName)
|
||||
qList = [
|
||||
{"q":"The server IP address ","c":"General","k":"ljayserverip"},
|
||||
{"q":"The IP address for webui","c":"General","k":"wwwip"},
|
||||
{"q":"Websocket type (ws or wss?) ","c":"General","k":"wstype"},
|
||||
{"q":"Websocket port ","c":"General","k":"wsport"},
|
||||
{"q":"How many lasers to use ","c":"General","k":"lasernumber"},
|
||||
{"q":"Laser 0 IP address ","c":"laser0","k":"ip"},
|
||||
{"q":"Laser 1 IP address ","c":"laser1","k":"ip"},
|
||||
@ -74,7 +54,7 @@ while stop == False :
|
||||
new_value = input("Please enter the new value:")
|
||||
config.set(choice["c"],choice["k"],new_value)
|
||||
config.write(open(gstt.ConfigName,'w'))
|
||||
if choice["k"] in ["wwwip","wstype","wsport"] :
|
||||
updateJSConfig(config)
|
||||
print("*****************************\nUpdated the www configuration\n*****************************")
|
||||
print(choice["c"],choice["k"])
|
||||
if choice["k"] == "wwwip":
|
||||
updateUI.www(new_value)
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
websocket_uri = "%wstype%://%wwwip%:%wsport%/"
|
||||
80
updateUI.py
80
updateUI.py
@ -1,31 +1,67 @@
|
||||
#!/usr/bin/python3
|
||||
#!/usr/bin/python2.7
|
||||
# -*- coding: utf-8 -*-
|
||||
# -*- mode: Python -*-
|
||||
'''
|
||||
LJ UI IP updater v0.9.0
|
||||
|
||||
MUST be called from configure.py
|
||||
LJ UI IP updater v0.8.1
|
||||
|
||||
'''
|
||||
#wwwIP = "192.168.2.78"
|
||||
#wwwIP = "aurora.teamlaser.fr"
|
||||
wwwIP = "192.168.1.48"
|
||||
|
||||
import os, sys
|
||||
import fileinput
|
||||
from shutil import copyfile
|
||||
ljpath = r'%s' % os.getcwd().replace('\\','/')
|
||||
|
||||
def www(config):
|
||||
global ljpath
|
||||
wwwip = config.get('General','wwwip')
|
||||
wstype = config.get('General','wstype')
|
||||
wsport = config.get('General','wsport')
|
||||
# copy template
|
||||
src = ljpath + "/templates/config.js"
|
||||
dst = ljpath + "/www/config.js"
|
||||
copyfile(src, dst)
|
||||
# Interpolate variables
|
||||
with fileinput.FileInput(dst, inplace=True) as file:
|
||||
for line in file:
|
||||
line = line.replace("%wstype%", wstype)
|
||||
line = line.replace("%wsport%", wsport)
|
||||
line = line.replace("%wwwip%", wwwip)
|
||||
print(line, end='')
|
||||
python2 = (2, 6) <= sys.version_info < (3, 0)
|
||||
|
||||
def Updatepage(file_name):
|
||||
|
||||
print("updating", file_name)
|
||||
f=open(file_name,"r+")
|
||||
a=f.readlines()
|
||||
#print a
|
||||
|
||||
for line in a:
|
||||
|
||||
if python2 == True:
|
||||
|
||||
# python2
|
||||
if "var LJ = " in line > -1:
|
||||
p=a.index(line)
|
||||
#so now we have the position of the line which to be modified
|
||||
a[p]=" var LJ = 'ws://"+wwwIP+":9001/'\n"
|
||||
#print(p, line, a[p])
|
||||
|
||||
else:
|
||||
|
||||
# python3
|
||||
IPline = ("var LJ = " in line)
|
||||
if IPline == True:
|
||||
|
||||
p=a.index(line)
|
||||
#so now we have the position of the line which to be modified
|
||||
a[p]=" var LJ = 'ws://"+wwwIP+":9001/'\n"
|
||||
#print(p, line, a[p])
|
||||
|
||||
f.seek(0)
|
||||
f.truncate() #ersing all data from the file
|
||||
f.close()
|
||||
#so now we have an empty file and we will write the modified content now in the file
|
||||
o=open(file_name,"w")
|
||||
for i in a:
|
||||
o.write(i)
|
||||
o.close()
|
||||
#now the modification is done in the file
|
||||
|
||||
def www(wwwip):
|
||||
global wwwIP
|
||||
|
||||
wwwIP = wwwip
|
||||
print("Updating www files to use", wwwIP)
|
||||
Updatepage(ljpath+"/www/LJ.js")
|
||||
Updatepage(ljpath+"/www/trckr/trckrcam1.html")
|
||||
Updatepage(ljpath+"/www/trckr/trckr.html")
|
||||
Updatepage(ljpath+"/www/simu.html")
|
||||
Updatepage(ljpath+"/www/align.html")
|
||||
Updatepage(ljpath+"/www/auralls.html")
|
||||
Updatepage(ljpath+"/www/index.html")
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
// LJ websocket address. IP will be updated at LJ startup according to LJ.conf wwwIP
|
||||
|
||||
var LJ = websocket_uri
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
|
||||
//
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
|
||||
<!-- Web audio buttons defaults -->
|
||||
<script type="application/javascript" src="webcomponents-lite.js"></script>
|
||||
<script type="application/javascript" src="config.js"></script>
|
||||
<script>
|
||||
WebAudioControlsOptions={
|
||||
useMidi:1,
|
||||
@ -659,7 +658,7 @@
|
||||
<!-- LJ style WS : A nettoyer ! -->
|
||||
|
||||
<script type="text/javascript">
|
||||
var LJ = websocket_uri
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
var _WS = {
|
||||
uri: LJ,
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
|
||||
<!-- Web audio buttons defaults -->
|
||||
<script type="application/javascript" src="webcomponents-lite.js"></script>
|
||||
<script type="application/javascript" src="config.js"></script>
|
||||
<script>
|
||||
WebAudioControlsOptions={
|
||||
useMidi:1,
|
||||
@ -418,7 +417,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var LJ = websocket_uri
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
|
||||
var pl = "";
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
|
||||
<!-- Web audio buttons defaults -->
|
||||
<script type="application/javascript" src="webcomponents-lite.js"></script>
|
||||
<script type="application/javascript" src="config.js"></script>
|
||||
<script>
|
||||
WebAudioControlsOptions={
|
||||
useMidi:1,
|
||||
@ -232,7 +231,7 @@
|
||||
<!-- LJ style WS : A nettoyer ! -->
|
||||
|
||||
<script type="text/javascript">
|
||||
var LJ = websocket_uri
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
|
||||
var _WS = {
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
|
||||
<!-- Web audio buttons defaults -->
|
||||
<script type="application/javascript" src="webcomponents-lite.js"></script>
|
||||
<script type="application/javascript" src="config.js"></script>
|
||||
<script>
|
||||
WebAudioControlsOptions={
|
||||
useMidi:1,
|
||||
@ -198,7 +197,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var LJ = websocket_uri
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
|
||||
var pl = "";
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
<title>PDM Modelviewer</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
|
||||
<script type="application/javascript" src="../config.js"></script>
|
||||
<style>
|
||||
@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
<title>PDM Modelviewer</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
|
||||
<script type="application/javascript" src="../config.js"></script>
|
||||
<style>
|
||||
@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="../touch-icon-iphone-retina.png">
|
||||
<link rel="apple-touch-icon" sizes="167x167" href="../touch-icon-ipad-retina.png">
|
||||
|
||||
<script type="application/javascript" src="../config.js"></script>
|
||||
<style>
|
||||
|
||||
|
||||
@ -379,7 +378,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var LJ = 'ws://192.168.2.43:9001/'
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
var _WS = {
|
||||
uri: LJ,
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="../touch-icon-iphone-retina.png">
|
||||
<link rel="apple-touch-icon" sizes="167x167" href="../touch-icon-ipad-retina.png">
|
||||
|
||||
<script type="application/javascript" src="../config.js"></script>
|
||||
<style>
|
||||
|
||||
|
||||
@ -379,7 +378,7 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var LJ = 'ws://192.168.2.43:9001/'
|
||||
var LJ = 'ws://192.168.2.44:9001/'
|
||||
|
||||
var _WS = {
|
||||
uri: LJ,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user