beremiz

Don't need to call extra _init_

2018-09-25, Andrey Skvortsov
33071a451021
Don't need to call extra _init_

_init_ is already called for value in infos["elmt_type"]["initial"]().
Additional _init_() creates second set of child element and that
creates unusable xml project.
This regression cause by not well tested commit "Proper fix for error
'object has no attribute 'getSlave' in EtherCAT extension" (96ca6b056c55595f71bfaca9f54b9e8646460c23)
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This file is part of Beremiz, a Integrated Development Environment for
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
# Copyright (C) 2012: Edouard TISSERANT and Laurent BESSARD
# Copyright (C) 2017: Andrey Skvortsov <andrej.skvortzov@gmail.com>
#
# See COPYING file for copyrights details.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from __future__ import absolute_import
import wx
from plcopen.structures import TestIdentifier, IEC_KEYWORDS
from util.TranslationCatalogs import NoTranslate
# -------------------------------------------------------------------------------
# POU Transition Dialog
# -------------------------------------------------------------------------------
def GetTransitionLanguages():
_ = NoTranslate
return [_("IL"), _("ST"), _("LD"), _("FBD")]
class PouTransitionDialog(wx.Dialog):
def __init__(self, parent):
wx.Dialog.__init__(self, parent, title=_('Create a new transition'))
self.TRANSITION_LANGUAGES_DICT = dict([(_(language), language)
for language in GetTransitionLanguages()])
main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)
main_sizer.AddGrowableCol(0)
main_sizer.AddGrowableRow(0)
infos_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=3, vgap=10)
infos_sizer.AddGrowableCol(1)
main_sizer.AddSizer(infos_sizer, border=20,
flag=wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT)
transitionname_label = wx.StaticText(self, label=_('Transition Name:'))
infos_sizer.AddWindow(transitionname_label, border=4,
flag=wx.ALIGN_CENTER_VERTICAL | wx.TOP)
self.TransitionName = wx.TextCtrl(self, size=wx.Size(180, -1))
infos_sizer.AddWindow(self.TransitionName, flag=wx.GROW)
language_label = wx.StaticText(self, label=_('Language:'))
infos_sizer.AddWindow(language_label, border=4,
flag=wx.ALIGN_CENTER_VERTICAL | wx.TOP)
self.Language = wx.ComboBox(self, style=wx.CB_READONLY)
infos_sizer.AddWindow(self.Language, flag=wx.GROW)
button_sizer = self.CreateButtonSizer(wx.OK | wx.CANCEL | wx.CENTRE)
self.Bind(wx.EVT_BUTTON, self.OnOK, button_sizer.GetAffirmativeButton())
main_sizer.AddSizer(button_sizer, border=20, flag=wx.ALIGN_RIGHT | wx.BOTTOM)
self.SetSizer(main_sizer)
for language in GetTransitionLanguages():
self.Language.Append(_(language))
self.Fit()
self.PouNames = []
self.PouElementNames = []
def OnOK(self, event):
error = []
transition_name = self.TransitionName.GetValue()
if self.TransitionName.GetValue() == "":
error.append(_("Transition Name"))
if self.Language.GetSelection() == -1:
error.append(_("Language"))
message = None
if len(error) > 0:
text = ""
for i, item in enumerate(error):
if i == 0:
text += item
elif i == len(error) - 1:
text += _(" and %s") % item
else:
text += _(", %s") % item
message = _("Form isn't complete. %s must be filled!") % text
elif not TestIdentifier(transition_name):
message = _("\"%s\" is not a valid identifier!") % transition_name
elif transition_name.upper() in IEC_KEYWORDS:
message = _("\"%s\" is a keyword. It can't be used!") % transition_name
elif transition_name.upper() in self.PouNames:
message = _("A POU named \"%s\" already exists!") % transition_name
elif transition_name.upper() in self.PouElementNames:
message = _("\"%s\" element for this pou already exists!") % transition_name
if message is not None:
dialog = wx.MessageDialog(self, message, _("Error"), wx.OK | wx.ICON_ERROR)
dialog.ShowModal()
dialog.Destroy()
else:
self.EndModal(wx.ID_OK)
def SetPouNames(self, pou_names):
self.PouNames = [pou_name.upper() for pou_name in pou_names]
def SetPouElementNames(self, pou_names):
self.PouElementNames = [pou_name.upper() for pou_name in pou_names]
def SetValues(self, values):
for item, value in values.items():
if item == "transitionName":
self.TransitionName.SetValue(value)
elif item == "language":
self.Language.SetSelection(_(value))
def GetValues(self):
values = {}
values["transitionName"] = self.TransitionName.GetValue()
values["language"] = self.TRANSITION_LANGUAGES_DICT[self.Language.GetStringSelection()]
return values