From 64fdc7815a0b07777d9c9706f02317d325f8f773 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sun, 1 Jan 2006 13:32:30 +0000 Subject: [PATCH] fixed sequence to floating point conversion in usals parameters --- lib/python/Components/NimManager.py | 8 ++++---- lib/python/Components/config.py | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 60484d61..b3be2603 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -127,9 +127,9 @@ class SecConfigure: else: loValue = rotorParam.WEST self.addLNBSimple(sec, slotid = x, diseqcmode = 3, - longitude = float(str(nim.longitude.value[0]) + "." + str(nim.longitude.value[1])), + longitude = configsequencearg.getFloat(nim.longitude), loDirection = loValue, - latitude = float(str(nim.latitude.value[0]) + "." + str(nim.latitude.value[1])), + latitude = configsequencearg.getFloat(nim.latitude), laDirection = laValue) # pass elif currentConfigSelectionElement(nim.configMode) == "nothing": @@ -254,9 +254,9 @@ class SecConfigure: sec.setCommandOrder(currCO) if currentConfigSelectionElement(currLnb.diseqcMode) == "1_2": - latitude = float(str(currLnb.latitude.value[0]) + "." + str(currLnb.latitude.value[1])) + latitude = configsequencearg.getFloat(currLnb.latitude) sec.setLatitude(latitude) - longitude = float(str(currLnb.longitude.value[0]) + "." + str(currLnb.longitude.value[1])) + longitude = configsequencearg.getFloat(currLnb.longitude) sec.setLongitude(longitude) if currentConfigSelectionElement(currLnb.latitudeOrientation) == "north": sec.setLaDirection(rotorParam.NORTH) diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index 25684fc1..40a460c2 100644 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -181,6 +181,9 @@ class configSequenceArg: # configsequencearg.get("FLOAT", [(min,max),(min1,max1)]) => x.y with min <= x <= max and min1 <= y <= max1 if (type == "FLOAT"): return (("."), args, "") + + def getFloat(self, element): + return float(("%d.%0" + str(len(str(element.vals[1][1][1]))) + "d") % (element.value[0], element.value[1])) configsequencearg = configSequenceArg() -- 2.30.2