# HG changeset patch # User dporopat # Date 1525871394 -7200 # Node ID c4ba142bf3fb1161a03693bc99f5b80124f68e2f # Parent 0d32b17f15b96b35753847714d85bc5eab0094f6 #2476 Separate connectors dialogs from connectors module. diff -r 0d32b17f15b9 -r c4ba142bf3fb connectors/PYRO/__init__.py --- a/connectors/PYRO/__init__.py Wed May 09 11:16:27 2018 +0200 +++ b/connectors/PYRO/__init__.py Wed May 09 15:09:54 2018 +0200 @@ -36,14 +36,6 @@ import Pyro.util from Pyro.errors import PyroError -try: - import wx - isWx = True -except ImportError: - isWx = False -else: - from controls.UriLocationEditor import IConnectorPanel - from zope.interface import implementer service_type = '_PYRO._tcp.local.' # this module attribute contains a list of DNS-SD (Zeroconf) service types @@ -52,8 +44,6 @@ # for connectors that do not support DNS-SD, this attribute can be omitted # or set to an empty list. -URITypes = ["LOCAL", "PYRO", "PYROS"] - def PYRO_connector_factory(uri, confnodesroot): """ @@ -214,56 +204,3 @@ return member return PyroProxyProxy() - -if isWx: - def PYRO_connector_dialog(confnodesroot): - [ID_IPTEXT, ID_PORTTEXT] = [wx.NewId() for _init_ctrls in range(2)] - - - @implementer(IConnectorPanel) - class PYROConnectorPanel(wx.Panel): - def __init__(self, typeConnector, parrent, *args, **kwargs): - self.type = typeConnector - self.parrent = parrent - wx.Panel.__init__(self, parrent, *args, **kwargs) - self._init_ctrls() - self._init_sizers() - self.uri = None - - def _init_ctrls(self): - self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1)) - self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1)) - - def _init_sizers(self): - self.mainSizer = wx.BoxSizer(wx.VERTICAL) - self.uriSizer = wx.BoxSizer(wx.HORIZONTAL) - self.portSizer = wx.BoxSizer(wx.HORIZONTAL) - - self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI host:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) - self.uriSizer.AddSpacer((0,0)) - self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT) - self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL) - - self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI port:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) - self.portSizer.AddSpacer((0,0)) - self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT) - self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL) - - self.SetSizer(self.mainSizer) - - def SetURI(self, uri): - self.uri = uri - uri_list = uri.strip().split(":") - length = len(uri_list) - if length == 3: - self.IpText.SetValue(uri_list[1].strip("/")) - self.PortText.SetValue(uri_list[2]) - elif length == 2: - self.IpText.SetValue(uri_list[1].strip("/")) - - - def GetURI(self): - self.uri = self.type+"://"+self.IpText.GetValue()+":"+self.PortText.GetValue() - return self.uri - - return PYROConnectorPanel("PYRO", confnodesroot) diff -r 0d32b17f15b9 -r c4ba142bf3fb connectors/WAMP/__init__.py --- a/connectors/WAMP/__init__.py Wed May 09 11:16:27 2018 +0200 +++ b/connectors/WAMP/__init__.py Wed May 09 15:09:54 2018 +0200 @@ -25,15 +25,7 @@ from __future__ import absolute_import from __future__ import print_function -try: - import wx - isWx = True -except ImportError: - isWx = False -else: - from controls.UriLocationEditor import IConnectorPanel - from zope.interface import implementer - +import sys import traceback from threading import Thread, Event @@ -48,7 +40,6 @@ _WampSession = None _WampConnection = None _WampSessionEvent = Event() -URITypes = ["WAMP", "WAMPS"] class WampSession(wamp.ApplicationSession): @@ -167,86 +158,3 @@ confnodesroot.logger.write_error(_("WAMP connection to '%s' failed.\n") % location) confnodesroot.logger.write_error(traceback.format_exc()) return None - -if isWx: - def WAMP_connector_dialog(confnodesroot): - [ID_IPTEXT, ID_PORTTEXT, ID_REALMTEXT, ID_WAMPIDTEXT, ID_SECURECHECKBOX] = [wx.NewId() for _init_ctrls in range(5)] - - - @implementer(IConnectorPanel) - class WAMPConnectorPanel(wx.Panel): - def __init__(self, typeConnector, parrent, *args, **kwargs): - self.type = typeConnector - self.parrent = parrent - wx.Panel.__init__(self, parrent, *args, **kwargs) - self._init_ctrls() - self._init_sizers() - self.uri = None - - def _init_ctrls(self): - self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1)) - self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1)) - self.RealmText = wx.TextCtrl(parent=self, id=ID_REALMTEXT, size = wx.Size(200, -1)) - self.WAMPIDText = wx.TextCtrl(parent=self, id=ID_WAMPIDTEXT, size = wx.Size(200, -1)) - self.SecureCheckbox = wx.CheckBox(self, ID_SECURECHECKBOX, _("Is connection secure?")) - - def _init_sizers(self): - self.mainSizer = wx.BoxSizer(wx.VERTICAL) - self.uriSizer = wx.BoxSizer(wx.HORIZONTAL) - self.portSizer = wx.BoxSizer(wx.HORIZONTAL) - self.realmSizer = wx.BoxSizer(wx.HORIZONTAL) - self.wampIDSizer = wx.BoxSizer(wx.HORIZONTAL) - - self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI host:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) - self.uriSizer.AddSpacer((0,0)) - self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT) - self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL) - - self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI port:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) - self.portSizer.AddSpacer((0,0)) - self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT) - self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL) - - self.realmSizer.Add(wx.StaticText(self, wx.ID_ANY, _("Realm:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) - self.realmSizer.AddSpacer((0, 0)) - self.realmSizer.Add(self.RealmText, proportion=1, flag=wx.ALIGN_RIGHT) - self.mainSizer.Add(self.realmSizer, border=2, flag=wx.ALL) - - self.wampIDSizer.Add(wx.StaticText(self, wx.ID_ANY, _("WAMP ID:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) - self.wampIDSizer.AddSpacer((0, 0)) - self.wampIDSizer.Add(self.WAMPIDText, proportion=1, flag=wx.ALIGN_RIGHT) - self.mainSizer.Add(self.wampIDSizer, border=2, flag=wx.ALL) - - self.mainSizer.Add(self.SecureCheckbox, proportion=1, flag=wx.ALIGN_LEFT) - - self.SetSizer(self.mainSizer) - - def SetURI(self, uri): - self.uri = uri - uri_list = uri.strip().split(":") - length = len(uri_list) - - if length > 0: - if uri_list[0] == URITypes[1]: - self.SecureCheckbox.SetValue(True) - - if length > 2: - self.IpText.SetValue(uri_list[1].strip("/")) - wampSett = uri_list[2].split("#") - length2 = len(wampSett) - if length2 > 0: - self.PortText.SetValue(wampSett[0]) - if length2 > 1: - self.RealmText.SetValue(wampSett[1]) - if length2 > 2: - self.WAMPIDText.SetValue(wampSett[2]) - - def GetURI(self): - if self.IpText.Validate(): - typeForURI = self.type + "S" if self.SecureCheckbox.GetValue() else self.type - self.uri = typeForURI + "://" + self.IpText.GetValue() + ":" + self.PortText.GetValue() + "#" + self.RealmText.GetValue() + "#" + self.WAMPIDText.GetValue() - return self.uri - else: - return "" - - return WAMPConnectorPanel("WAMP", confnodesroot) diff -r 0d32b17f15b9 -r c4ba142bf3fb connectors/__init__.py --- a/connectors/__init__.py Wed May 09 11:16:27 2018 +0200 +++ b/connectors/__init__.py Wed May 09 15:09:54 2018 +0200 @@ -36,12 +36,6 @@ def _GetLocalConnectorClassFactory(name): return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_factory") -def _GetLocalConnectorClassDialog(name): - return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_dialog") - -def _GetLocalConnectorURITypes(name): - return lambda: getattr(__import__(name, globals(), locals()), "URITypes", None) - connectors = {name: _GetLocalConnectorClassFactory(name) @@ -49,12 +43,6 @@ if (path.isdir(path.join(_base_path, name)) and not name.startswith("__"))} -connectors_dialog = {name: - {"function":_GetLocalConnectorClassDialog(name), "URITypes": _GetLocalConnectorURITypes(name)} - for name in listdir(_base_path) - if (path.isdir(path.join(_base_path, name)) and - not name.startswith("__"))} - def ConnectorFactory(uri, confnodesroot): """ @@ -80,22 +68,3 @@ # import module according to uri type connectorclass = connectors[servicetype]() return connectorclass(uri, confnodesroot) - - -def ConnectorDialog(type, confnodesroot): - if type not in connectors_dialog: - return None - - connectorclass = connectors_dialog[type]["function"]() - return connectorclass(confnodesroot) - -def GetConnectorFromURI(uri): - typeOfConnector = None - for t in connectors_dialog: - connectorTypes = connectors_dialog[t]["URITypes"]() - if connectorTypes and uri in connectorTypes: - typeOfConnector = t - break - - return typeOfConnector - diff -r 0d32b17f15b9 -r c4ba142bf3fb connectors_dialog/PYRO/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/connectors_dialog/PYRO/__init__.py Wed May 09 15:09:54 2018 +0200 @@ -0,0 +1,86 @@ +#!/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) 2007: Edouard TISSERANT and Laurent BESSARD +# +# 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 +from __future__ import print_function + +import wx +from controls.UriLocationEditor import IConnectorPanel +from zope.interface import implementer + +URITypes = ["LOCAL", "PYRO", "PYROS"] + + +def PYRO_connector_dialog(confnodesroot): + [ID_IPTEXT, ID_PORTTEXT] = [wx.NewId() for _init_ctrls in range(2)] + + + @implementer(IConnectorPanel) + class PYROConnectorPanel(wx.Panel): + def __init__(self, typeConnector, parrent, *args, **kwargs): + self.type = typeConnector + self.parrent = parrent + wx.Panel.__init__(self, parrent, *args, **kwargs) + self._init_ctrls() + self._init_sizers() + self.uri = None + + def _init_ctrls(self): + self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1)) + self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1)) + + def _init_sizers(self): + self.mainSizer = wx.BoxSizer(wx.VERTICAL) + self.uriSizer = wx.BoxSizer(wx.HORIZONTAL) + self.portSizer = wx.BoxSizer(wx.HORIZONTAL) + + self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI host:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.uriSizer.AddSpacer((0,0)) + self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL) + + self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, "URI port:", size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.portSizer.AddSpacer((0,0)) + self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL) + + self.SetSizer(self.mainSizer) + + def SetURI(self, uri): + self.uri = uri + uri_list = uri.strip().split(":") + length = len(uri_list) + if length == 3: + self.IpText.SetValue(uri_list[1].strip("/")) + self.PortText.SetValue(uri_list[2]) + elif length == 2: + self.IpText.SetValue(uri_list[1].strip("/")) + + + def GetURI(self): + self.uri = self.type+"://"+self.IpText.GetValue()+":"+self.PortText.GetValue() + return self.uri + + return PYROConnectorPanel("PYRO", confnodesroot) diff -r 0d32b17f15b9 -r c4ba142bf3fb connectors_dialog/WAMP/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/connectors_dialog/WAMP/__init__.py Wed May 09 15:09:54 2018 +0200 @@ -0,0 +1,115 @@ +#!/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) 2007: Edouard TISSERANT and Laurent BESSARD +# +# 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 +from __future__ import print_function +import wx +from controls.UriLocationEditor import IConnectorPanel +from zope.interface import implementer + +URITypes = ["WAMP", "WAMPS"] + + +def WAMP_connector_dialog(confnodesroot): + [ID_IPTEXT, ID_PORTTEXT, ID_REALMTEXT, ID_WAMPIDTEXT, ID_SECURECHECKBOX] = [wx.NewId() for _init_ctrls in range(5)] + + + @implementer(IConnectorPanel) + class WAMPConnectorPanel(wx.Panel): + def __init__(self, typeConnector, parrent, *args, **kwargs): + self.type = typeConnector + self.parrent = parrent + wx.Panel.__init__(self, parrent, *args, **kwargs) + self._init_ctrls() + self._init_sizers() + self.uri = None + + def _init_ctrls(self): + self.IpText = wx.TextCtrl(parent=self, id=ID_IPTEXT, size = wx.Size(200, -1)) + self.PortText = wx.TextCtrl(parent=self, id=ID_PORTTEXT, size = wx.Size(200, -1)) + self.RealmText = wx.TextCtrl(parent=self, id=ID_REALMTEXT, size = wx.Size(200, -1)) + self.WAMPIDText = wx.TextCtrl(parent=self, id=ID_WAMPIDTEXT, size = wx.Size(200, -1)) + self.SecureCheckbox = wx.CheckBox(self, ID_SECURECHECKBOX, _("Is connection secure?")) + + def _init_sizers(self): + self.mainSizer = wx.BoxSizer(wx.VERTICAL) + self.uriSizer = wx.BoxSizer(wx.HORIZONTAL) + self.portSizer = wx.BoxSizer(wx.HORIZONTAL) + self.realmSizer = wx.BoxSizer(wx.HORIZONTAL) + self.wampIDSizer = wx.BoxSizer(wx.HORIZONTAL) + + self.uriSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI host:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.uriSizer.AddSpacer((0,0)) + self.uriSizer.Add(self.IpText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.uriSizer, border=2, flag=wx.ALL) + + self.portSizer.Add(wx.StaticText(self, wx.ID_ANY, _("URI port:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.portSizer.AddSpacer((0,0)) + self.portSizer.Add(self.PortText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.portSizer, border=2, flag=wx.ALL) + + self.realmSizer.Add(wx.StaticText(self, wx.ID_ANY, _("Realm:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.realmSizer.AddSpacer((0, 0)) + self.realmSizer.Add(self.RealmText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.realmSizer, border=2, flag=wx.ALL) + + self.wampIDSizer.Add(wx.StaticText(self, wx.ID_ANY, _("WAMP ID:"), size = wx.Size(70, -1)), proportion=0, flag=wx.ALIGN_CENTER_VERTICAL) + self.wampIDSizer.AddSpacer((0, 0)) + self.wampIDSizer.Add(self.WAMPIDText, proportion=1, flag=wx.ALIGN_RIGHT) + self.mainSizer.Add(self.wampIDSizer, border=2, flag=wx.ALL) + + self.mainSizer.Add(self.SecureCheckbox, proportion=1, flag=wx.ALIGN_LEFT) + + self.SetSizer(self.mainSizer) + + def SetURI(self, uri): + self.uri = uri + uri_list = uri.strip().split(":") + length = len(uri_list) + + if length > 0: + if uri_list[0] == URITypes[1]: + self.SecureCheckbox.SetValue(True) + + if length > 2: + self.IpText.SetValue(uri_list[1].strip("/")) + wampSett = uri_list[2].split("#") + length2 = len(wampSett) + if length2 > 0: + self.PortText.SetValue(wampSett[0]) + if length2 > 1: + self.RealmText.SetValue(wampSett[1]) + if length2 > 2: + self.WAMPIDText.SetValue(wampSett[2]) + + def GetURI(self): + if self.IpText.Validate(): + typeForURI = self.type + "S" if self.SecureCheckbox.GetValue() else self.type + self.uri = typeForURI + "://" + self.IpText.GetValue() + ":" + self.PortText.GetValue() + "#" + self.RealmText.GetValue() + "#" + self.WAMPIDText.GetValue() + return self.uri + else: + return "" + + return WAMPConnectorPanel("WAMP", confnodesroot) diff -r 0d32b17f15b9 -r c4ba142bf3fb connectors_dialog/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/connectors_dialog/__init__.py Wed May 09 15:09:54 2018 +0200 @@ -0,0 +1,35 @@ +from __future__ import absolute_import +from os import listdir, path +import util.paths as paths + +_base_path = paths.AbsDir(__file__) + + +def _GetLocalConnectorClassDialog(name): + return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_dialog") + +def _GetLocalConnectorURITypes(name): + return lambda: getattr(__import__(name, globals(), locals()), "URITypes", None) + +connectors_dialog = {name: + {"function":_GetLocalConnectorClassDialog(name), "URITypes": _GetLocalConnectorURITypes(name)} + for name in listdir(_base_path) + if (path.isdir(path.join(_base_path, name)) and + not name.startswith("__"))} + +def ConnectorDialog(type, confnodesroot): + if type not in connectors_dialog: + return None + + connectorclass = connectors_dialog[type]["function"]() + return connectorclass(confnodesroot) + +def GetConnectorFromURI(uri): + typeOfConnector = None + for t in connectors_dialog: + connectorTypes = connectors_dialog[t]["URITypes"]() + if connectorTypes and uri in connectorTypes: + typeOfConnector = t + break + + return typeOfConnector \ No newline at end of file diff -r 0d32b17f15b9 -r c4ba142bf3fb controls/UriLocationEditor.py --- a/controls/UriLocationEditor.py Wed May 09 11:16:27 2018 +0200 +++ b/controls/UriLocationEditor.py Wed May 09 15:09:54 2018 +0200 @@ -1,7 +1,7 @@ import wx from zope.interface import Interface, Attribute from zope.interface.verify import verifyObject -from connectors import connectors_dialog, ConnectorDialog, GetConnectorFromURI +from connectors_dialog import connectors_dialog, ConnectorDialog, GetConnectorFromURI [ID_URIWIZARDDIALOG,ID_URITYPECHOICE] = [wx.NewId() for _init_ctrls in range(2)]