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

remove item QgsInterface from import class menu in python console

Browse Source 
since a369ed0 it is no longer necessary to import iface object
This commit is contained in:
Salvatore Larosa 2013-01-12 21:13:14 +01:00
parent 13bfb5eb9a
commit 8203effa72
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/console/console.py
View File

@ -167,16 +167,6 @@ class PythonConsoleWidget(QWidget):
self.loadSextanteButton.setIconVisibleInMenu(True) self.loadSextanteButton.setIconVisibleInMenu(True)
self.loadSextanteButton.setToolTip(loadSextanteBt) self.loadSextanteButton.setToolTip(loadSextanteBt)
self.loadSextanteButton.setText(loadSextanteBt) self.loadSextanteButton.setText(loadSextanteBt)
## Import QgisInterface class
loadIfaceBt = QCoreApplication.translate("PythonConsole", "Import QgisInterface class")
self.loadIfaceButton = QAction(parent)
self.loadIfaceButton.setCheckable(False)
self.loadIfaceButton.setEnabled(True)
self.loadIfaceButton.setIcon(QgsApplication.getThemeIcon("console/iconIfaceConsole.png"))
self.loadIfaceButton.setMenuRole(QAction.PreferencesRole)
self.loadIfaceButton.setIconVisibleInMenu(True)
self.loadIfaceButton.setToolTip(loadIfaceBt)
self.loadIfaceButton.setText(loadIfaceBt)
## Import QtCore class ## Import QtCore class
loadQtCoreBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore class") loadQtCoreBt = QCoreApplication.translate("PythonConsole", "Import PyQt.QtCore class")
self.loadQtCoreButton = QAction(parent) self.loadQtCoreButton = QAction(parent)
@ -246,7 +236,6 @@ class PythonConsoleWidget(QWidget):
self.toolBar.addAction(self.runButton) self.toolBar.addAction(self.runButton)
## Menu Import Class ## Menu Import Class
self.classMenu = QMenu(self) self.classMenu = QMenu(self)
self.classMenu.addAction(self.loadIfaceButton)
self.classMenu.addAction(self.loadSextanteButton) self.classMenu.addAction(self.loadSextanteButton)
self.classMenu.addAction(self.loadQtCoreButton) self.classMenu.addAction(self.loadQtCoreButton)
self.classMenu.addAction(self.loadQtGuiButton) self.classMenu.addAction(self.loadQtGuiButton)
@ -293,7 +282,6 @@ class PythonConsoleWidget(QWidget):
self.clearButton.triggered.connect(self.textEditOut.clearConsole) self.clearButton.triggered.connect(self.textEditOut.clearConsole)
self.optionsButton.triggered.connect(self.openSettings) self.optionsButton.triggered.connect(self.openSettings)
self.loadIfaceButton.triggered.connect(self.iface)
self.loadSextanteButton.triggered.connect(self.sextante) self.loadSextanteButton.triggered.connect(self.sextante)
self.loadQtCoreButton.triggered.connect(self.qtCore) self.loadQtCoreButton.triggered.connect(self.qtCore)
self.loadQtGuiButton.triggered.connect(self.qtGui) self.loadQtGuiButton.triggered.connect(self.qtGui)
@ -307,9 +295,6 @@ class PythonConsoleWidget(QWidget):
def sextante(self): def sextante(self):
self.edit.commandConsole('sextante') self.edit.commandConsole('sextante')
def iface(self):
self.edit.commandConsole('iface')
def qtCore(self): def qtCore(self):
self.edit.commandConsole('qtCore') self.edit.commandConsole('qtCore')

2
python/console/console_output.py
View File

@ -125,7 +125,7 @@ class EditorOutput(QsciScintilla):
def insertInitText(self): def insertInitText(self):
txtInit = QCoreApplication.translate("PythonConsole", txtInit = QCoreApplication.translate("PythonConsole",
"## To access Quantum GIS environment from this console\n" "## To access Quantum GIS environment from this console\n"
"## iface object (instance of QgisInterface class). \n" "## use iface object (instance of QgisInterface class). \n"
"## Type help(iface) for more info and list of methods.\n\n") "## Type help(iface) for more info and list of methods.\n\n")
initText = self.setText(txtInit) initText = self.setText(txtInit)

7
python/console/console_sci.py
View File

@ -31,7 +31,7 @@ import os
import code import code
_init_commands = ["from qgis.core import *", "import qgis.utils", _init_commands = ["from qgis.core import *", "import qgis.utils",
"from qgis.utils import iface"] "from qgis.utils import iface"]
_historyFile = os.path.join(str(QDir.homePath()),".qgis","console_history.txt") _historyFile = os.path.join(str(QDir.homePath()),".qgis","console_history.txt")
class PythonEdit(QsciScintilla, code.InteractiveInterpreter): class PythonEdit(QsciScintilla, code.InteractiveInterpreter):
@ -128,10 +128,7 @@ class PythonEdit(QsciScintilla, code.InteractiveInterpreter):
selCmdLenght = self.text(line).length() selCmdLenght = self.text(line).length()
self.setSelection(line, 4, line, selCmdLenght) self.setSelection(line, 4, line, selCmdLenght)
self.removeSelectedText() self.removeSelectedText()
if command == "iface": if command == "sextante":
# import QgisInterface class
self.append('from qgis.utils import iface')
elif command == "sextante":
# import Sextante class # import Sextante class
self.append('import sextante') self.append('import sextante')
elif command == "qtCore": elif command == "qtCore":