-
-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
adding pop-up menu with an item for delete command from history + ref…
…actoring
- Loading branch information
lindakladivova
committed
Jan 8, 2024
1 parent
c670734
commit 845daff
Showing
8 changed files
with
287 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,28 +13,20 @@ | |
| for details. | ||
| @author Linda Karlovska (Kladivova) [email protected] | ||
| @author Anna Petrasova (kratochanna gmail com) | ||
| @author Tomas Zigo | ||
| """ | ||
|
|
||
| import wx | ||
| import re | ||
|
|
||
| from core import globalvar | ||
| from core.gcmd import GError, GException | ||
| from core.utils import ( | ||
| parse_mapcalc_cmd, | ||
| replace_module_cmd_special_flags, | ||
| split, | ||
| ) | ||
| from gui_core.forms import GUI | ||
| from gui_core.treeview import CTreeView | ||
|
|
||
| from gui_core.wrap import SearchCtrl | ||
| from history.tree import HistoryBrowserTree | ||
|
|
||
| from grass.pydispatch.signal import Signal | ||
|
|
||
|
|
||
| class HistoryBrowser(wx.Panel): | ||
| """History browser for executing the commands from history log. | ||
| """History browser panel for executing the commands from history log. | ||
| Signal: | ||
| showNotification - attribute 'message' | ||
|
|
@@ -52,22 +44,24 @@ def __init__( | |
| self.parent = parent | ||
| self._giface = giface | ||
|
|
||
| self.showNotification = Signal("HistoryBrowser.showNotification") | ||
| self.runIgnoredCmdPattern = Signal("HistoryBrowser.runIgnoredCmdPattern") | ||
| wx.Panel.__init__(self, parent=parent, id=id, **kwargs) | ||
| self.SetName("HistoryBrowser") | ||
|
|
||
| self._createTree() | ||
|
|
||
| self._giface.currentMapsetChanged.connect(self.UpdateHistoryModelFromScratch) | ||
| self._giface.updateHistory.connect( | ||
| lambda cmd: self.UpdateHistoryModelByCommand(cmd) | ||
| ) | ||
| self.showNotification = Signal("HistoryBrowser.showNotification") | ||
| self.runIgnoredCmdPattern = Signal("HistoryBrowser.runIgnoredCmdPattern") | ||
|
|
||
| # search box | ||
| self.search = SearchCtrl(self) | ||
| self.search.SetDescriptiveText(_("Search")) | ||
| self.search.ShowCancelButton(True) | ||
| self.search.Bind(wx.EVT_TEXT, lambda evt: self.Filter(evt.GetString())) | ||
| self.search.Bind(wx.EVT_SEARCHCTRL_CANCEL_BTN, lambda evt: self.Filter("")) | ||
| self.search.Bind(wx.EVT_TEXT, lambda evt: self.tree.Filter(evt.GetString())) | ||
| self.search.Bind(wx.EVT_SEARCHCTRL_CANCEL_BTN, lambda evt: self.tree.Filter("")) | ||
|
|
||
| # tree with layers | ||
| self.tree = HistoryBrowserTree(self, giface=giface) | ||
| self.tree.SetToolTip(_("Double-click to run selected tool")) | ||
| self.tree.showNotification.connect(self.showNotification) | ||
| self.tree.runIgnoredCmdPattern.connect(self.runIgnoredCmdPattern) | ||
|
|
||
| self._layout() | ||
|
|
||
|
|
@@ -81,83 +75,9 @@ def _layout(self): | |
| border=5, | ||
| ) | ||
| sizer.Add( | ||
| self._tree, proportion=1, flag=wx.EXPAND | wx.LEFT | wx.RIGHT, border=5 | ||
| self.tree, proportion=1, flag=wx.EXPAND | wx.LEFT | wx.RIGHT, border=5 | ||
| ) | ||
|
|
||
| self.SetSizerAndFit(sizer) | ||
| self.SetAutoLayout(True) | ||
| self.Layout() | ||
|
|
||
| def _createTree(self): | ||
| """Create tree based on the model""" | ||
| self._model = HistoryBrowserTree() | ||
| self._tree = self._getTreeInstance() | ||
| self._tree.SetToolTip(_("Double-click to open the tool")) | ||
| self._tree.selectionChanged.connect(self.OnItemSelected) | ||
| self._tree.itemActivated.connect(lambda node: self.Run(node)) | ||
|
|
||
| def _getTreeInstance(self): | ||
| return CTreeView(model=self._model.GetModel(), parent=self) | ||
|
|
||
| def _getSelectedNode(self): | ||
| selection = self._tree.GetSelected() | ||
| if not selection: | ||
| return None | ||
| return selection[0] | ||
|
|
||
| def _refreshTree(self): | ||
| self._tree.SetModel(self._model.GetModel()) | ||
|
|
||
| def Filter(self, text): | ||
| """Filter history | ||
| :param str text: text string | ||
| """ | ||
| model = self._model.GetModel() | ||
| if text: | ||
| model = self._model.model.Filtered(key=["command"], value=text) | ||
| self._tree.SetModel(model) | ||
| else: | ||
| self._tree.SetModel(model) | ||
|
|
||
| def UpdateHistoryModelFromScratch(self): | ||
| """Update the model from scratch and refresh the tree""" | ||
| self._model.CreateModel() | ||
| self._refreshTree() | ||
|
|
||
| def UpdateHistoryModelByCommand(self, cmd): | ||
| """Update the model by the command and refresh the tree""" | ||
| self._model.UpdateModel(cmd) | ||
| self._refreshTree() | ||
|
|
||
| def OnItemSelected(self, node): | ||
| """Item selected""" | ||
| command = node.data["command"] | ||
| self.showNotification.emit(message=command) | ||
|
|
||
| def Run(self, node=None): | ||
| """Parse selected history command into list and launch module dialog.""" | ||
| node = node or self._getSelectedNode() | ||
| if node: | ||
| command = node.data["command"] | ||
| if ( | ||
| globalvar.ignoredCmdPattern | ||
| and re.compile(globalvar.ignoredCmdPattern).search(command) | ||
| and "--help" not in command | ||
| and "--ui" not in command | ||
| ): | ||
| self.runIgnoredCmdPattern.emit(cmd=split(command)) | ||
| return | ||
| if re.compile(r"^r[3]?\.mapcalc").search(command): | ||
| command = parse_mapcalc_cmd(command) | ||
| command = replace_module_cmd_special_flags(command) | ||
| lst = split(command) | ||
| try: | ||
| GUI(parent=self, giface=self._giface).ParseCommand(lst) | ||
| except GException as e: | ||
| GError( | ||
| parent=self, | ||
| message=str(e), | ||
| caption=_("Cannot be parsed into command"), | ||
| showTraceback=False, | ||
| ) | ||
Oops, something went wrong.