beremiz: comparison editors/TextViewer.py

equal deleted inserted replaced

-:a375e31bf312
+:c1298e7ffe3a
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#This file is part of PLCOpenEditor, a library implementing an IEC 61131-3 editor
+# This file is part of Beremiz, a Integrated Development Environment for
-#based on the plcopen standard.
+# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
 #
-#Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
+# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
 #
-#See COPYING file for copyrights details.
+# See COPYING file for copyrights details.
 #
-#This library is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
-#modify it under the terms of the GNU General Public
+# modify it under the terms of the GNU General Public License
-#License as published by the Free Software Foundation; either
+# as published by the Free Software Foundation; either version 2
-#version 2.1 of the License, or (at your option) any later version.
+# of the License, or (at your option) any later version.
 #
-#This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#General Public License for more details.
+# GNU General Public License for more details.
 #
-#You should have received a copy of the GNU General Public
+# You should have received a copy of the GNU General Public License
-#License along with this library; if not, write to the Free Software
+# along with this program; if not, write to the Free Software
-#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 import re
 from types import *
 import wx
 LETTERS.append(chr(ord('a') + i))
 LETTERS.append(chr(ord('A') + i))
 [STC_PLC_WORD, STC_PLC_COMMENT, STC_PLC_NUMBER, STC_PLC_STRING,
 STC_PLC_VARIABLE, STC_PLC_PARAMETER, STC_PLC_FUNCTION, STC_PLC_JUMP,
-STC_PLC_ERROR, STC_PLC_SEARCH_RESULT] = range(10)
+STC_PLC_ERROR, STC_PLC_SEARCH_RESULT,
+STC_PLC_EMPTY] = range(11)
 [SPACE, WORD, NUMBER, STRING, WSTRING, COMMENT, PRAGMA, DPRAGMA] = range(8)
 [ID_TEXTVIEWER, ID_TEXTVIEWERTEXTCTRL,
 ] = [wx.NewId() for _init_ctrls in range(2)]
 blockinputs = values[3]
 else:
 blockinputs = None
 if values[1] != "function":
 if blockname == "":
-dialog = wx.TextEntryDialog(self.ParentWindow, "Block name", "Please enter a block name", "", wx.OK|wx.CANCEL|wx.CENTRE)
+dialog = wx.TextEntryDialog(self.ParentWindow, _("Block name"), _("Please enter a block name"), "", wx.OK|wx.CANCEL|wx.CENTRE)
 if dialog.ShowModal() == wx.ID_OK:
 blockname = dialog.GetValue()
 else:
+event.SetDragText("")
 return
 dialog.Destroy()
 if blockname.upper() in [name.upper() for name in self.Controler.GetProjectPouNames(self.Debug)]:
 message = _("\"%s\" pou already exists!")%blockname
 elif blockname.upper() in [name.upper() for name in self.Controler.GetEditedElementVariables(self.TagName, self.Debug)]:
 if len(values) > 2 and pou_type == "program":
 var_name = values[3]
 dlg = wx.TextEntryDialog(
 self.ParentWindow,
 _("Confirm or change variable name"),
-'Variable Drop', var_name)
+_('Variable Drop'), var_name)
 dlg.SetValue(var_name)
 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
 dlg.Destroy()
 if var_name is None:
 return
 else:
 location = values[0]
 if not location.startswith("%"):
 dialog = wx.SingleChoiceDialog(self.ParentWindow,
 _("Select a variable class:"), _("Variable class"),
-["Input", "Output", "Memory"],
+[_("Input"), _("Output"), _("Memory")],
 wx.DEFAULT_DIALOG_STYLE|wx.OK|wx.CANCEL)
 if dialog.ShowModal() == wx.ID_OK:
 selected = dialog.GetSelection()
 else:
 selected = None
 initval = values[0]
 var_name = values[3]
 dlg = wx.TextEntryDialog(
 self.ParentWindow,
 _("Confirm or change variable name"),
-'Variable Drop', var_name)
+_('Variable Drop'), var_name)
 dlg.SetValue(var_name)
 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
 dlg.Destroy()
 if var_name is None:
 return
 elif values[1] == "Global":
 var_name = values[0]
 dlg = wx.TextEntryDialog(
 self.ParentWindow,
 _("Confirm or change variable name"),
-'Variable Drop', var_name)
+_('Variable Drop'), var_name)
 dlg.SetValue(var_name)
 var_name = dlg.GetValue() if dlg.ShowModal() == wx.ID_OK else None
 dlg.Destroy()
 if var_name is None:
 return
 def SetKeywords(self, keywords):
 self.Keywords = [keyword.upper() for keyword in keywords]
 self.Colourise(0, -1)
 def RefreshJumpList(self):
-if self.TextSyntax != "IL":
+if self.TextSyntax == "IL":
 self.Jumps = [jump.upper() for jump in LABEL_MODEL.findall(self.GetText())]
 self.Colourise(0, -1)
 # Buffer the last model state
 def RefreshBuffer(self):
 line += char
 if char == NEWLINE:
 self.ContextStack = []
 current_context = self.Variables
 if state == COMMENT:
-self.SetStyling(current_pos - last_styled_pos + 1, STC_PLC_COMMENT)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_COMMENT)
 elif state == NUMBER:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 elif state == WORD:
 if word in self.Keywords or word in self.TypeNames:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_WORD)
 elif self.TextSyntax == "IL" and word in self.Jumps:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP)
 elif word in self.EnumeratedValues:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 else:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 if word not in ["]", ")"] and (self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos):
 self.StartStyling(last_styled_pos, wx.stc.STC_INDICS_MASK)
 self.SetStyling(current_pos - last_styled_pos, wx.stc.STC_INDIC0_MASK)
 self.StartStyling(current_pos, 0xff)
 else:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 last_styled_pos = current_pos
-if state != DPRAGMA:
+if (state != DPRAGMA) and (state != COMMENT):
 state = SPACE
 line = ""
 line_number += 1
 self.RefreshLineFolding(line_number)
 elif line.endswith("(*") and state != COMMENT:
-self.SetStyling(current_pos - last_styled_pos - 1, 31)
+self.SetStyling(current_pos - last_styled_pos - 1, STC_PLC_EMPTY)
 last_styled_pos = current_pos
 if state == WORD:
 current_context = self.Variables
 state = COMMENT
 elif line.endswith("{") and state not in [PRAGMA, DPRAGMA]:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 last_styled_pos = current_pos
 if state == WORD:
 current_context = self.Variables
 state = PRAGMA
 elif line.endswith("{{") and state == PRAGMA:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 last_styled_pos = current_pos
 state = DPRAGMA
 elif state == COMMENT:
 if line.endswith("*)"):
 self.SetStyling(current_pos - last_styled_pos + 2, STC_PLC_COMMENT)
 last_styled_pos = current_pos + 1
 state = SPACE
+if len(self.CallStack) > 0:
+current_call = self.CallStack.pop()
+else:
+current_call = None
 elif state == PRAGMA:
 if line.endswith("}"):
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 last_styled_pos = current_pos
 state = SPACE
 elif state == DPRAGMA:
 if line.endswith("}}"):
-self.SetStyling(current_pos - last_styled_pos + 1, 31)
+self.SetStyling(current_pos - last_styled_pos + 1, STC_PLC_EMPTY)
 last_styled_pos = current_pos + 1
 state = SPACE
 elif (line.endswith("'") or line.endswith('"')) and state not in [STRING, WSTRING]:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 last_styled_pos = current_pos
 if state == WORD:
 current_context = self.Variables
 if line.endswith("'"):
 state = STRING
 elif char in LETTERS:
 if state == NUMBER:
 word = "#"
 state = WORD
 elif state == SPACE:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 word = char
 last_styled_pos = current_pos
 state = WORD
 else:
 word += char
 elif char in NUMBERS or char == '.' and state != WORD:
 if state == SPACE:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 last_styled_pos = current_pos
 state = NUMBER
 elif state == WORD and char != '.':
 word += char
 elif char == '(' and state == SPACE:
 elif self.TextSyntax == "IL" and word in self.Jumps:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP)
 elif word in self.EnumeratedValues:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 else:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 if word not in ["]", ")"] and (self.GetCurrentPos() < last_styled_pos or self.GetCurrentPos() > current_pos):
 self.StartStyling(last_styled_pos, wx.stc.STC_INDICS_MASK)
 self.SetStyling(current_pos - last_styled_pos, wx.stc.STC_INDIC0_MASK)
 self.StartStyling(current_pos, 0xff)
 if char == '.':
 elif word in self.Jumps:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_JUMP)
 elif word in self.EnumeratedValues:
 self.SetStyling(current_pos - last_styled_pos, STC_PLC_NUMBER)
 else:
-self.SetStyling(current_pos - last_styled_pos, 31)
+self.SetStyling(current_pos - last_styled_pos, STC_PLC_EMPTY)
 else:
-self.SetStyling(current_pos - start_pos, 31)
+self.SetStyling(current_pos - start_pos, STC_PLC_EMPTY)
 self.ShowHighlights(start_pos, end_pos)
 event.Skip()
 def OnMarginClick(self, event):
 if event.GetMargin() == 2:
 def Find(self, direction, search_params):
 if self.SearchParams != search_params:
 self.ClearHighlights(SEARCH_RESULT_HIGHLIGHT)
 self.SearchParams = search_params
-criteria = {
-"raw_pattern": search_params["find_pattern"],
-"pattern": re.compile(search_params["find_pattern"]),
-"case_sensitive": search_params["case_sensitive"],
-"regular_expression": search_params["regular_expression"],
-"filter": "all"}
 self.SearchResults = [
 (infos[1:], start, end, SEARCH_RESULT_HIGHLIGHT)
 for infos, start, end, text in
-self.Search(criteria)]
+self.Search(search_params)]
 self.CurrentFindHighlight = None
 if len(self.SearchResults) > 0:
 if self.CurrentFindHighlight is not None:
 old_idx = self.SearchResults.index(self.CurrentFindHighlight)
 indent = (indent / 2 + 1) * 2
 self.Editor.AddText("\n" + " " * indent)
 key_handled = True
 elif key == wx.WXK_BACK:
 if self.TextSyntax in ["ST", "ALL"]:
-indent = self.Editor.GetLineIndentation(line)
+if not self.Editor.GetSelectedText():
-if lineText.strip() == "" and indent > 0:
+indent = self.Editor.GetColumn(self.Editor.GetCurrentPos())
-self.Editor.DelLineLeft()
+if lineText.strip() == "" and len(lineText) > 0 and indent > 0:
-self.Editor.AddText(" " * ((max(0, indent - 1) / 2) * 2))
+self.Editor.DelLineLeft()
-key_handled = True
+self.Editor.AddText(" " * ((max(0, indent - 1) / 2) * 2))
+key_handled = True
 if not key_handled:
 event.Skip()
-elif key in NAVIGATION_KEYS:
+else:
 event.Skip()
 def OnKillFocus(self, event):
 self.Editor.AutoCompCancel()
 event.Skip()

changeset 1911	c1298e7ffe3a
parent 1637	6f4624687b89
child 1730	64d8f52bc8c8