beremiz

Fix non-marking as manually forced floating point variable if the value isn't integer

2019-02-21, Andrey Skvortsov
69cef4e37ef9
Fix non-marking as manually forced floating point variable if the value isn't integer

For example, if user in debug variable panel set any floating point
variable to 34.3, then it's not shown as forced (blue color) and user
can't release this enforcement.

If user changes the value to 34.0, then enforcement shows
correctly. This is done because binary representation of floating point
numbers in IDE and runtime can be slightly different (double vs float)
and as a result values aren't equal.
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This file is part of Beremiz.
# See COPYING file for copyrights details.
from __future__ import absolute_import
from plcopen.XSLTModelQuery import XSLTModelQuery, _StringValue, _BoolValue, _translate_args
from plcopen.types_enums import CLASS_TYPES, POU_TYPES, VAR_CLASS_INFOS
def class_extraction(value):
class_type = CLASS_TYPES.get(value)
if class_type is not None:
return class_type
pou_type = POU_TYPES.get(value)
if pou_type is not None:
return pou_type
var_type = VAR_CLASS_INFOS.get(value)
if var_type is not None:
return var_type[1]
return None
class _VariablesTreeItemInfos(object):
__slots__ = ["name", "var_class", "type", "edit", "debug", "variables"]
def __init__(self, *args):
for attr, value in zip(self.__slots__, args):
setattr(self, attr, value if value is not None else "")
def copy(self):
return _VariablesTreeItemInfos(*[getattr(self, attr) for attr in self.__slots__])
class VariablesTreeInfosFactory(object):
def __init__(self):
self.Root = None
def GetRoot(self):
return self.Root
def SetRoot(self, context, *args):
self.Root = _VariablesTreeItemInfos(
*([''] + _translate_args(
[class_extraction, _StringValue] + [_BoolValue] * 2,
args) + [[]]))
def AddVariable(self, context, *args):
if self.Root is not None:
self.Root.variables.append(_VariablesTreeItemInfos(
*(_translate_args(
[_StringValue, class_extraction, _StringValue] +
[_BoolValue] * 2, args) + [[]])))
class POUVariablesCollector(XSLTModelQuery):
def __init__(self, controller):
XSLTModelQuery.__init__(self,
controller,
"pou_variables.xslt",
[(name, self.FactoryCaller(name))
for name in ["SetRoot", "AddVariable"]])
def FactoryCaller(self, funcname):
def CallFactory(*args):
return getattr(self.factory, funcname)(*args)
return CallFactory
def Collect(self, root, debug):
self.factory = VariablesTreeInfosFactory()
self._process_xslt(root, debug)
res = self.factory.GetRoot()
self.factory = None
return res