sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-16 00:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

[pyqgis-console] fix import statement

Browse Source
This commit is contained in:
Salvatore Larosa 2016-03-21 22:23:38 +01:00
parent ab5f06b9fb
commit 20ce2343cb
2 changed files with 21 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
python/console/console.py
View File

@ -328,36 +328,6 @@ class PythonConsoleWidget(QWidget):
self.actionClass.setIconVisibleInMenu(True) self.actionClass.setIconVisibleInMenu(True)
self.actionClass.setToolTip(actionClassBt) self.actionClass.setToolTip(actionClassBt)
self.actionClass.setText(actionClassBt) self.actionClass.setText(actionClassBt)
## Import Processing class
loadProcessingBt = QCoreApplication.translate("PythonConsole", "Import Processing Class")
self.loadProcessingButton = QAction(self)
self.loadProcessingButton.setCheckable(False)
self.loadProcessingButton.setEnabled(True)
self.loadProcessingButton.setIcon(QgsApplication.getThemeIcon("console/iconProcessingConsole.png"))
self.loadProcessingButton.setMenuRole(QAction.PreferencesRole)
self.loadProcessingButton.setIconVisibleInMenu(True)
self.loadProcessingButton.setToolTip(loadProcessingBt)
self.loadProcessingButton.setText(loadProcessingBt)
## Import QtCore class
loadQtCoreBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore Class")
self.loadQtCoreButton = QAction(self)
self.loadQtCoreButton.setCheckable(False)
self.loadQtCoreButton.setEnabled(True)
self.loadQtCoreButton.setIcon(QgsApplication.getThemeIcon("console/iconQtCoreConsole.png"))
self.loadQtCoreButton.setMenuRole(QAction.PreferencesRole)
self.loadQtCoreButton.setIconVisibleInMenu(True)
self.loadQtCoreButton.setToolTip(loadQtCoreBt)
self.loadQtCoreButton.setText(loadQtCoreBt)
## Import QtGui class
loadQtGuiBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtGui Class")
self.loadQtGuiButton = QAction(self)
self.loadQtGuiButton.setCheckable(False)
self.loadQtGuiButton.setEnabled(True)
self.loadQtGuiButton.setIcon(QgsApplication.getThemeIcon("console/iconQtGuiConsole.png"))
self.loadQtGuiButton.setMenuRole(QAction.PreferencesRole)
self.loadQtGuiButton.setIconVisibleInMenu(True)
self.loadQtGuiButton.setToolTip(loadQtGuiBt)
self.loadQtGuiButton.setText(loadQtGuiBt)
## Action for Run script ## Action for Run script
runBt = QCoreApplication.translate("PythonConsole", "Run Command") runBt = QCoreApplication.translate("PythonConsole", "Run Command")
self.runButton = QAction(self) self.runButton = QAction(self)
@ -424,10 +394,24 @@ class PythonConsoleWidget(QWidget):
self.toolBarEditor.addAction(self.objectListButton) self.toolBarEditor.addAction(self.objectListButton)
## Menu Import Class ## Menu Import Class
default_command = {
(QCoreApplication.translate("PythonConsole", "Import Processing Class"),
QgsApplication.getThemeIcon("console/iconProcessingConsole.png")):
["import processing"],
(QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore Class"),
QgsApplication.getThemeIcon("console/iconQtCoreConsole.png")):
["from PyQt.QtCore import *"],
(QCoreApplication.translate("PythonConsole", "Import PyQt.QtGui Class"),
QgsApplication.getThemeIcon("console/iconQtGuiConsole.png")):
["from PyQt.QtGui import *", "from PyQt.QtWidgets import *"]
}
self.classMenu = QMenu() self.classMenu = QMenu()
self.classMenu.addAction(self.loadProcessingButton) for (title, icon), commands in default_command.iteritems():
self.classMenu.addAction(self.loadQtCoreButton) action = self.classMenu.addAction(icon, title)
self.classMenu.addAction(self.loadQtGuiButton) action.triggered[()].connect(
lambda commands=commands: self.shell.commandConsole(commands))
cM = self.toolBar.widgetForAction(self.actionClass) cM = self.toolBar.widgetForAction(self.actionClass)
cM.setMenu(self.classMenu) cM.setMenu(self.classMenu)
cM.setPopupMode(QToolButton.InstantPopup) cM.setPopupMode(QToolButton.InstantPopup)
@ -528,9 +512,6 @@ class PythonConsoleWidget(QWidget):
self.showEditorButton.toggled.connect(self.toggleEditor) self.showEditorButton.toggled.connect(self.toggleEditor)
self.clearButton.triggered.connect(self.shellOut.clearConsole) self.clearButton.triggered.connect(self.shellOut.clearConsole)
self.optionsButton.triggered.connect(self.openSettings) self.optionsButton.triggered.connect(self.openSettings)
self.loadProcessingButton.triggered.connect(self.processing)
self.loadQtCoreButton.triggered.connect(self.qtCore)
self.loadQtGuiButton.triggered.connect(self.qtGui)
self.runButton.triggered.connect(self.shell.entered) self.runButton.triggered.connect(self.shell.entered)
self.openFileButton.triggered.connect(self.openScriptFile) self.openFileButton.triggered.connect(self.openScriptFile)
self.openInEditorButton.triggered.connect(self.openScriptFileExtEditor) self.openInEditorButton.triggered.connect(self.openScriptFileExtEditor)
@ -577,15 +558,6 @@ class PythonConsoleWidget(QWidget):
objName = itemName objName = itemName
tabEditor.goToLine(objName, linenr) tabEditor.goToLine(objName, linenr)
def processing(self):
self.shell.commandConsole('processing')
def qtCore(self):
self.shell.commandConsole('qtCore')
def qtGui(self):
self.shell.commandConsole('qtGui')
def toggleEditor(self, checked): def toggleEditor(self, checked):
self.splitterObj.show() if checked else self.splitterObj.hide() self.splitterObj.show() if checked else self.splitterObj.hide()
if not self.tabEditorWidget: if not self.tabEditorWidget:

16
python/console/console_sci.py
View File

@ -160,24 +160,16 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter):
elif radioButtonSource == 'fromDocAPI': elif radioButtonSource == 'fromDocAPI':
self.autoCompleteFromAll() self.autoCompleteFromAll()
def commandConsole(self, command): def commandConsole(self, commands):
if not self.is_cursor_on_last_line(): if not self.is_cursor_on_last_line():
self.move_cursor_to_end() self.move_cursor_to_end()
line, pos = self.getCursorPosition() line, pos = self.getCursorPosition()
selCmdLenght = len(self.text(line)) selCmdLenght = len(self.text(line))
self.setSelection(line, 4, line, selCmdLenght) self.setSelection(line, 4, line, selCmdLenght)
self.removeSelectedText() self.removeSelectedText()
if command == "processing": for cmd in commands:
# import Processing class self.append(cmd)
self.append('import processing') self.entered()
elif command == "qtCore":
# import QtCore class
self.append('from PyQt.QtCore import *')
elif command == "qtGui":
# import QtGui class
self.append('from PyQt.QtGui import *')
self.append('from PyQt.QtWidgets import *')
self.entered()
self.move_cursor_to_end() self.move_cursor_to_end()
self.setFocus() self.setFocus()