diff -r c02818d7e29f -r 7e61baa047f0 dialogs/ForceVariableDialog.py --- a/dialogs/ForceVariableDialog.py Mon Aug 14 22:30:41 2017 +0300 +++ b/dialogs/ForceVariableDialog.py Mon Aug 14 23:27:15 2017 +0300 @@ -36,6 +36,7 @@ "D" : ["DINT", "UDINT", "REAL", "DWORD"], "L" : ["LINT", "ULINT", "LREAL", "LWORD"]} + def gen_get_function(f): def get_function(v): try: @@ -44,6 +45,7 @@ return None return get_function + def gen_get_string(delimiter): STRING_MODEL = re.compile("%(delimiter)s([^%(delimiter)s]*)%(delimiter)s$" % {"delimiter": delimiter}) def get_string(v): @@ -68,6 +70,7 @@ IEC_DATETIME_MODEL = re.compile("(?:(?:DT|DATE_AND_TIME)#)?([0-9]{4})-([0-9]{2})-([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2}(?:\.[0-9]+)?)$") IEC_TIMEOFDAY_MODEL = re.compile("(?:(?:TOD|TIME_OF_DAY)#)?([0-9]{2}):([0-9]{2}):([0-9]{2}(?:\.[0-9]+)?)$") + def gettime(v): result = IEC_TIME_MODEL.match(v.upper()) if result is not None: @@ -91,6 +94,7 @@ else: return None + def getdate(v): result = IEC_DATE_MODEL.match(v.upper()) if result is not None: @@ -104,6 +108,7 @@ else: return None + def getdatetime(v): result = IEC_DATETIME_MODEL.match(v.upper()) if result is not None: @@ -117,6 +122,7 @@ else: return None + def gettimeofday(v): result = IEC_TIMEOFDAY_MODEL.match(v.upper()) if result is not None: @@ -156,6 +162,7 @@ # Force Variable Dialog #------------------------------------------------------------------------------- + class ForceVariableDialog(wx.TextEntryDialog): def __init__(self, parent, iec_type, defaultValue=""):