git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
save configSequence floating point correctly
[enigma2.git]
/
lib
/
python
/
Components
/
config.py
diff --git
a/lib/python/Components/config.py
b/lib/python/Components/config.py
index 51e753caf4261e9ac0d166a59309e08dc4727028..e1c0bf8abef992971421c58eb8cd250845faa13b 100644
(file)
--- a/
lib/python/Components/config.py
+++ b/
lib/python/Components/config.py
@@
-257,23
+257,17
@@
class configSequence:
olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
olddec = oldvalue % 10 ** (numberLen - posinblock) - (oldvalue % 10 ** (numberLen - posinblock - 1))
newvalue = oldvalue - olddec + (10 ** (numberLen - posinblock - 1) * number)
- print "You actually pressed a number (" + str(number) + ") which will be added at block number " + str(blocknumber) + " on position " + str(posinblock)
- print "Old value: " + str(oldvalue) + " olddec: " + str(olddec) + " newvalue: " + str(newvalue)
self.parent.value[blocknumber] = newvalue
self.markedPos += 1
self.checkValues()
self.parent.value[blocknumber] = newvalue
self.markedPos += 1
self.checkValues()
- print "markPos:",
- print self.markedPos
-
#FIXME: dont call when press left/right
self.parent.change()
def __call__(self, selected): #needed by configlist
value = ""
mPos = self.markedPos
#FIXME: dont call when press left/right
self.parent.change()
def __call__(self, selected): #needed by configlist
value = ""
mPos = self.markedPos
- print "Positon: " + str(mPos)
num = 0;
for i in self.parent.value:
if len(value): #fixme no heading separator possible
num = 0;
for i in self.parent.value:
if len(value): #fixme no heading separator possible
@@
-285,7
+279,6
@@
class configSequence:
#if diff > 0:
## if this helps?!
#value += " " * diff
#if diff > 0:
## if this helps?!
#value += " " * diff
- print (("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i)
if (self.censorChar == ""):
value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i
else:
if (self.censorChar == ""):
value += ("%0" + str(len(str(self.valueBounds[num][1]))) + "d") % i
else:
@@
-323,7
+316,6
@@
class configText:
self.parent.save()
def nextEntry(self):
self.parent.save()
def nextEntry(self):
- print self.parent
self.parent.vals[1](self.parent.getConfigPath())
def handleKey(self, key):
self.parent.vals[1](self.parent.getConfigPath())
def handleKey(self, key):
@@
-487,16
+479,20
@@
class configElement:
return str(data.strip())
elif control == configSequence:
return str(data.strip())
elif control == configSequence:
+ print self.vals
+ print self.value
try:
try:
- value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
+ value = ""
+ count = 0
+ for i in data:
+ if value !="":
+ value += self.vals[0]
+ value += (("%0" + str(len(str(self.vals[1][count][1]))) + "d") % i)
+ count += 1
+ #value = ((len(data) * ("%d" + self.vals[0]))[0:-1]) % tuple(data)
except:
value = str(data)
except:
value = str(data)
-# just in case you don't understand the above, here an equivalent:
-# value = ""
-# for i in data:
-# if value !="":
-# value += self.vals[0]
-# value += str(i)
+
return value
elif control == configSatlist:
return str(self.vals[self.value][1]);
return value
elif control == configSatlist:
return str(self.vals[self.value][1]);
@@
-526,13
+522,14
@@
class configElement:
#is this right? activate settings after load/cancel and use default
self.change()
#is this right? activate settings after load/cancel and use default
self.change()
- def __init__(self, configPath, control, defaultValue, vals):
+ def __init__(self, configPath, control, defaultValue, vals
, saveDefaults = True
):
self.configPath = configPath
self.defaultValue = defaultValue
self.controlType = control
self.vals = vals
self.notifierList = [ ]
self.enabled = True
self.configPath = configPath
self.defaultValue = defaultValue
self.controlType = control
self.vals = vals
self.notifierList = [ ]
self.enabled = True
+ self.saveDefaults = saveDefaults
self.loadData()
def getConfigPath(self):
self.loadData()
def getConfigPath(self):
@@
-547,7
+544,7
@@
class configElement:
def reload(self):
self.loadData()
def save(self):
def reload(self):
self.loadData()
def save(self):
- if self.defaultValue != self.value:
+ if self.defaultValue != self.value
or self.saveDefaults == True
:
configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
class configElement_nonSave(configElement):
configfile.setKey(self.configPath, self.datatoFile(self.controlType,self.value))
class configElement_nonSave(configElement):