--- a/plugger.py Tue Aug 12 16:25:18 2008 +0200
+++ b/plugger.py Tue Aug 12 16:27:07 2008 +0200
@@ -592,7 +592,7 @@
from PLCControler import PLCControler
from PLCOpenEditor import PLCOpenEditor, ProjectDialog
from TextViewer import TextViewer
-from plcopen.structures import IEC_KEYWORDS, AddPluginBlockList, ClearPluginTypes, PluginTypes+from plcopen.structures import IEC_KEYWORDS @@ -814,10 +814,10 @@
# Update PLCOpenEditor Plugin Block types from loaded plugins
def RefreshPluginsBlockLists(self):
if getattr(self, "PluggedChilds", None) is not None:
- AddPluginBlockList(self.BlockTypesFactory())+ self.ClearPluginTypes() + self.AddPluginBlockList(self.BlockTypesFactory()) for child in self.IterChilds():
- AddPluginBlockList(child.BlockTypesFactory())+ self.AddPluginBlockList(child.BlockTypesFactory()) if self.PLCEditor is not None:
self.PLCEditor.RefreshEditor()
@@ -906,7 +906,7 @@
# files are listed to stdout, and errors to stderr.
status, result, err_result = ProcessLogger(
- "\"%s\" \"%s\" -I \"%s\" \"%s\""%(+ "\"%s\" -f \"%s\" -I \"%s\" \"%s\""%( @@ -937,6 +937,9 @@
Method called by user to (re)build SoftPLC and plugin tree
+ if self.PLCEditor is not None: + self.PLCEditor.ClearErrors() buildpath = self._getBuildPath()
# Eventually create build dir
@@ -1050,8 +1053,15 @@
self.EnableMethod("_Run", True)
+ def ShowError(self, logger, from_location, to_location): + chunk_infos = self.GetChunkInfos(from_location, to_location) + for infos, (start_row, start_col) in chunk_infos: + start = (from_location[0] - start_row, from_location[1] - start_col) + end = (to_location[0] - start_row, to_location[1] - start_col) + self.PLCEditor.ShowError(infos, start, end) def _showIECcode(self, logger):
plc_file = self._getIECcodepath()
new_dialog = wx.Frame(self.AppFrame)
