Skip to content

Commit 10a57ad

Browse files
volayavolaya
committedNov 14, 2012
fixed problem when running grass in modeler (wrong output names, it was a problem introduced by the grass session functionalities)
reverted shell=true in R execution Removed help files help menu
·
ltr-3_40Before-merge-new_vector_api
1 parent 81807d4 commit 10a57ad

File tree

838 files changed

+41
-50485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

838 files changed

+41
-50485
lines changed
 

‎python/plugins/sextante/SextantePlugin.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,13 @@ def initGui(self):
9494
QObject.connect(self.resultsAction, SIGNAL("triggered()"), self.openResults)
9595
self.menu.addAction(self.resultsAction)
9696

97-
self.helpAction = QAction(QIcon(":/sextante/images/help.png"),
98-
QCoreApplication.translate("SEXTANTE", "&SEXTANTE help"),
99-
self.iface.mainWindow())
100-
QObject.connect(self.helpAction, SIGNAL("triggered()"), self.openHelp)
101-
self.menu.addAction(self.helpAction)
97+
#=======================================================================
98+
# self.helpAction = QAction(QIcon(":/sextante/images/help.png"),
99+
# QCoreApplication.translate("SEXTANTE", "&SEXTANTE help"),
100+
# self.iface.mainWindow())
101+
# QObject.connect(self.helpAction, SIGNAL("triggered()"), self.openHelp)
102+
# self.menu.addAction(self.helpAction)
103+
#=======================================================================
102104

103105
menuBar = self.iface.mainWindow().menuBar()
104106
menuBar.insertMenu(menuBar.actions()[-1], self.menu)
@@ -137,5 +139,7 @@ def openConfig(self):
137139
dlg = ConfigDialog(self.toolbox)
138140
dlg.exec_()
139141

140-
def openHelp(self):
141-
QDesktopServices.openUrl(QUrl(os.path.dirname(__file__) + "/help/index.html"))
142+
#===========================================================================
143+
# def openHelp(self):
144+
# QDesktopServices.openUrl(QUrl(os.path.dirname(__file__) + "/help/index.html"))
145+
#===========================================================================

‎python/plugins/sextante/core/Sextante.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
from sextante.gdal.GdalOgrAlgorithmProvider import GdalOgrAlgorithmProvider
4848
from sextante.mmqgisx.MMQGISXAlgorithmProvider import MMQGISXAlgorithmProvider
4949
from sextante.otb.OTBAlgorithmProvider import OTBAlgorithmProvider
50-
from sextante.pymorph.PymorphAlgorithmProvider import PymorphAlgorithmProvider
50+
#from sextante.pymorph.PymorphAlgorithmProvider import PymorphAlgorithmProvider
5151
from sextante.r.RAlgorithmProvider import RAlgorithmProvider
5252
from sextante.saga.SagaAlgorithmProvider import SagaAlgorithmProvider
5353
from sextante.script.ScriptAlgorithmProvider import ScriptAlgorithmProvider
@@ -120,7 +120,7 @@ def initialize():
120120
Sextante.addProvider(FToolsAlgorithmProvider())
121121
Sextante.addProvider(ModelerOnlyAlgorithmProvider())
122122
Sextante.addProvider(GdalOgrAlgorithmProvider())
123-
Sextante.addProvider(PymorphAlgorithmProvider())
123+
#Sextante.addProvider(PymorphAlgorithmProvider())
124124
Sextante.addProvider(LidarToolsAlgorithmProvider())
125125
Sextante.addProvider(OTBAlgorithmProvider())
126126
Sextante.addProvider(RAlgorithmProvider())

0 commit comments

Comments
 (0)
Please sign in to comment.