equal
deleted
inserted
replaced
22 # You should have received a copy of the GNU General Public License |
22 # You should have received a copy of the GNU General Public License |
23 # along with this program; if not, write to the Free Software |
23 # along with this program; if not, write to the Free Software |
24 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
24 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
25 |
25 |
26 |
26 |
27 from __future__ import absolute_import |
27 |
28 import re |
28 import re |
29 |
29 |
30 import wx |
30 import wx |
31 |
31 |
32 from graphics.FBD_Objects import FBD_Block |
32 from graphics.FBD_Objects import FBD_Block |
175 # Define regular expression for determine if block name is block |
175 # Define regular expression for determine if block name is block |
176 # default name |
176 # default name |
177 default_name_model = GetBlockTypeDefaultNameModel(blocktype) |
177 default_name_model = GetBlockTypeDefaultNameModel(blocktype) |
178 |
178 |
179 # For each parameters defined, set corresponding control value |
179 # For each parameters defined, set corresponding control value |
180 for name, value in values.items(): |
180 for name, value in list(values.items()): |
181 |
181 |
182 # Parameter is block name |
182 # Parameter is block name |
183 if name == "name": |
183 if name == "name": |
184 if value != "": |
184 if value != "": |
185 # Set default graphic element name for testing |
185 # Set default graphic element name for testing |
210 if self.BlockName.IsEnabled() and self.BlockName.GetValue() != "": |
210 if self.BlockName.IsEnabled() and self.BlockName.GetValue() != "": |
211 values["name"] = self.BlockName.GetValue() |
211 values["name"] = self.BlockName.GetValue() |
212 values["width"], values["height"] = self.Element.GetSize() |
212 values["width"], values["height"] = self.Element.GetSize() |
213 values.update({ |
213 values.update({ |
214 name: control.GetValue() |
214 name: control.GetValue() |
215 for name, control in self.ParamsControl.iteritems()}) |
215 for name, control in self.ParamsControl.items()}) |
216 return values |
216 return values |
217 |
217 |
218 def OnOK(self, event): |
218 def OnOK(self, event): |
219 """ |
219 """ |
220 Called when dialog OK button is pressed |
220 Called when dialog OK button is pressed |