Skip to content

Commit a36a2a9

Browse files
author
volayaf@gmail.com
committedJun 15, 2012
updated help
git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@246 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
1 parent cfab06e commit a36a2a9

19 files changed

+92
-194
lines changed
 

‎src/sextante/core/AlgorithmProvider.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ class AlgorithmProvider():
99
'''
1010

1111
def __init__(self):
12+
#indicates if the provider should be active by default.
13+
#For provider relying on an external software, this should be
14+
#false, so the user should activate them manually and install
15+
#the required software in advance.
16+
self.activate = True
1217
self.actions = []
1318
self.contextMenuActions = []
1419

20+
1521
def loadAlgorithms(self):
1622
self.algs = []
1723
name = "ACTIVATE_" + self.getName().upper().replace(" ", "_")
@@ -36,7 +42,7 @@ def initializeSettings(self):
3642
By default it just adds a setting to activate or deactivate algorithms from the provider'''
3743
SextanteConfig.settingIcons[self.getDescription()] = self.getIcon()
3844
name = "ACTIVATE_" + self.getName().upper().replace(" ", "_")
39-
SextanteConfig.addSetting(Setting(self.getDescription(), name, "Activate", True))
45+
SextanteConfig.addSetting(Setting(self.getDescription(), name, "Activate", self.activate))
4046

4147
def unload(self):
4248
'''Do here anything that you want to be done when the provider is removed from the list of available ones.

‎src/sextante/core/Sextante.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
from sextante.modeler.ModelerOnlyAlgorithmProvider import ModelerOnlyAlgorithmProvider
1818
from sextante.gdal.GdalAlgorithmProvider import GdalAlgorithmProvider
1919
from sextante.otb.OTBAlgorithmProvider import OTBAlgorithmProvider
20-
from sextante.lastools.LasToolsAlgorithmProvider import LasToolsAlgorithmProvider
21-
from sextante.core.SextanteUtils import SextanteUtils
2220
from sextante.algs.SextanteAlgorithmProvider import SextanteAlgorithmProvider
23-
from sextante.fusion.FusionAlgorithmProvider import FusionAlgorithmProvider
2421
from sextante.pymorph.PymorphAlgorithmProvider import PymorphAlgorithmProvider
2522
from sextante.mmqgisx.MMQGISXAlgorithmProvider import MMQGISXAlgorithmProvider
2623
from sextante.lidar.LidarToolsAlgorithmProvider import LidarToolsAlgorithmProvider

‎src/sextante/core/SextanteExternalAppsConfigurer.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/sextante/gui/ConfigDialog.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
from PyQt4.QtGui import *
33
from PyQt4 import QtCore, QtGui
44
from sextante.core.SextanteConfig import SextanteConfig
5-
from sextante.core.Sextante import Sextante
6-
from sextante.core.SextanteUtils import SextanteUtils
7-
from sextante.gui.ExternalAppsConfigurer import ExternalAppsConfigurer
85

96

107
class ConfigDialog(QtGui.QDialog):
@@ -41,13 +38,6 @@ def setupUi(self):
4138
self.buttonBox = QtGui.QDialogButtonBox()
4239
self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
4340
self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
44-
#=======================================================================
45-
# if SextanteUtils.isWindows():
46-
# self.externalAppsButton = QtGui.QPushButton()
47-
# self.externalAppsButton.setText("Configure external apps")
48-
# self.horizontalLayout.addWidget(self.externalAppsButton)
49-
# QtCore.QObject.connect(self.externalAppsButton, QtCore.SIGNAL("clicked()"), self.configureExternalApps)
50-
#=======================================================================
5141
self.horizontalLayout.addSpacing(100)
5242
self.horizontalLayout.addWidget(self.buttonBox)
5343
self.verticalLayout.addLayout(self.horizontalLayout)
@@ -56,10 +46,6 @@ def setupUi(self):
5646
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), self.cancelPressed)
5747
QtCore.QMetaObject.connectSlotsByName(self)
5848

59-
def configureExternalApps(self):
60-
configurer = ExternalAppsConfigurer()
61-
configurer.configure()
62-
6349

6450
def fillTree(self):
6551
self.items = {}

‎src/sextante/gui/ExternalAppsConfigurer.py

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/sextante/gui/HTMLViewerDialog.py

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/sextante/gui/InteractiveHTMLViewerDialog.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/sextante/gui/SextanteToolbox.py

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
from sextante.core.SextanteLog import SextanteLog
1010
from sextante.core.SextanteConfig import SextanteConfig
1111
from sextante.core.QGisLayers import QGisLayers
12+
import os
13+
import sys
14+
import subprocess
1215

1316
try:
1417
_fromUtf8 = QtCore.QString.fromUtf8
@@ -37,6 +40,10 @@ def setupUi(self):
3740
self.verticalLayout = QtGui.QVBoxLayout(self.contents)
3841
self.verticalLayout.setSpacing(2)
3942
self.verticalLayout.setMargin(0)
43+
self.externalAppsButton = QtGui.QPushButton()
44+
self.externalAppsButton.setText("Click here to configure additional algorithm providers")
45+
QObject.connect(self.externalAppsButton, QtCore.SIGNAL("clicked()"), self.configureProviders)
46+
self.verticalLayout.addWidget(self.externalAppsButton)
4047
self.searchBox = QtGui.QLineEdit(self.contents)
4148
self.searchBox.textChanged.connect(self.fillTree)
4249
self.verticalLayout.addWidget(self.searchBox)
@@ -52,6 +59,15 @@ def setupUi(self):
5259
self.iface.addDockWidget(Qt.RightDockWidgetArea, self)
5360
QtCore.QMetaObject.connectSlotsByName(self)
5461

62+
def configureProviders(self):
63+
filename = os.path.join(os.path.dirname(__file__), "..", "help", "3rdParty.html")
64+
if os.name == "nt":
65+
os.startfile(filename)
66+
elif sys.platform == "darwin":
67+
subprocess.Popen(('open', filename))
68+
else:
69+
subprocess.call(('xdg-open', filename))
70+
5571
def showPopupMenu(self,point):
5672
item = self.algorithmTree.itemAt(point)
5773
if isinstance(item, TreeAlgorithmItem):
@@ -141,18 +157,20 @@ def fillTree(self):
141157
groups[alg.group] = groupItem
142158
algItem = TreeAlgorithmItem(alg)
143159
groupItem.addChild(algItem)
144-
#add actions
145-
actions = Sextante.actions[providerName]
146-
for action in actions:
147-
if text =="" or text.lower() in action.name.lower():
148-
if action.group in groups:
149-
groupItem = groups[action.group]
150-
else:
151-
groupItem = QtGui.QTreeWidgetItem()
152-
groupItem.setText(0,action.group)
153-
groups[action.group] = groupItem
154-
algItem = TreeActionItem(action)
155-
groupItem.addChild(algItem)
160+
161+
#add actions only if there are algorithms in this provider
162+
if len(groups)>0:
163+
actions = Sextante.actions[providerName]
164+
for action in actions:
165+
if text =="" or text.lower() in action.name.lower():
166+
if action.group in groups:
167+
groupItem = groups[action.group]
168+
else:
169+
groupItem = QtGui.QTreeWidgetItem()
170+
groupItem.setText(0,action.group)
171+
groups[action.group] = groupItem
172+
algItem = TreeActionItem(action)
173+
groupItem.addChild(algItem)
156174

157175
if len(groups)>0:
158176
providerItem = QtGui.QTreeWidgetItem()

‎src/sextante/help/3rdParty.html

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,18 @@ <h1>Configuring external applications<a class="headerlink" href="#configuring-ex
5252
<div class="section" id="introduction">
5353
<h2>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline"></a></h2>
5454
<p>SEXTANTE can be extended using additional applications, calling them
55-
from within SEXTANTE. Currently, SAGA, GRASS, OTB(Orfeo Toolbox) and R are supported, along
56-
with some other command-line applications that provide spatial data
57-
analysis functionalities.
58-
This chapter will show you how to configure SEXTANTE to include these
55+
from within SEXTANTE.</p>
56+
<p>By default, algorithms coming from external applications are not activated unless SEXTANTE has checked that the corresponding applications are installed in your system and can be executed. That means that there are probably many more algorithms available than those that you can see in the toolbox, but some extra configuration is needed to have them fully operational.</p>
57+
<p>This chapter will show you how to configure SEXTANTE to include these
5958
additional applications. Once you have correctly configured the system,
6059
you will be able to execute external algorithms from any SEXTANTE
6160
component like the toolbox or the graphical modeler, just like you do
6261
with any other SEXTANTE geoalgorithm.</p>
62+
<p>At the time of writing this manual, SEXTANTE has two external providers activated by default: GRASS and GDAL. This providers are activated because QGIS includes both the GRASS binaries and the GDAL library files, so there is no need for further configuration (QGIS developers have done that in advance for you). This might change in other versions, but for now it means that you need to manually install and configure those external programs. Do not worry, this is very easy to do. If you are running Linux, you just have to install the software yourself and then activate the corresponding algorithm provider. If you are running Windows, you should also tell SEXTANTE the path to the software.</p>
63+
<p>For each algorithm provider there is a group entry in the SEXTANTE configuration dialog, which contains at least an &#8220;Activate&#8221; item. Other parameters might appear if they are needed to configure the provider (mostly paths to executales and additional files). In the following sections, we will see how to set those parameters for the main providers currently available for SEXTANTE. But first, a couple of quick notes with important information about using algorithms based on external applications.</p>
6364
<div class="section" id="a-note-on-file-formats">
6465
<h3>A note on file formats<a class="headerlink" href="#a-note-on-file-formats" title="Permalink to this headline"></a></h3>
66+
<p>Algorithms provided by external applications have some differences when compared to &#8220;native&#8221; SEXTANTE algorithm. The main one of them is related to the file formats supported both for input and for output.</p>
6567
<p>When using an external software, opening a file in QGIS does not mean
6668
that it can be opened and processed as well on that other software. In
6769
most cases, it can read what you have opened in QGIS, but in some cases,
@@ -114,7 +116,7 @@ <h3>A note on vector layer selections<a class="headerlink" href="#a-note-on-vect
114116
<h2>SAGA<a class="headerlink" href="#saga" title="Permalink to this headline"></a></h2>
115117
<p>SAGA algorithms can be run from SEXTANTE if you have SAGA installed in
116118
your system and you configure SEXTANTE properly so it can find SAGA
117-
executables. In particular, the SAGA commandline executable is needed
119+
executables. In particular, the SAGA command-line executable is needed
118120
to run SAGA algorithms. SAGA binaries are not included with SEXTANTE, so
119121
you have to download and install the software yourself. Please check the
120122
SAGA website at for more information. SAGA 2.0.8 is needed.</p>
@@ -187,7 +189,7 @@ <h2>R. Creating R scripts<a class="headerlink" href="#r-creating-r-scripts" titl
187189
the syntax to use to call those R commands from SEXTANTE and how to use
188190
SEXTANTE objects (layers, tables) in them.</p>
189191
<p>The first thing you have to do, as we saw in the case of SAGA, is to
190-
tell SEXTANTE where you R binaries are located. You can do so using the
192+
tell SEXTANTE where your R binaries are located. You can do so using the
191193
<em>R folder</em> entry in the SEXTANTE configuration dialog. Once you have set
192194
that parameter, you can start creating your own R scripts and executing
193195
them.</p>
@@ -265,8 +267,9 @@ <h2>R. Creating R scripts<a class="headerlink" href="#r-creating-r-scripts" titl
265267
console instead, you have to tell SEXTANTE that you want the console to
266268
be shown once the execution is finished. To do so, just start the
267269
command lines that produce the results you want to print with the
268-
<math xmlns="http://www.w3.org/1998/Math/MathML">
269-
<mrow><mo>&gt;</mo></mrow></math>” sign. The output of all other lines will not be shown. For
270+
<span class="math">
271+
\(&gt;\)</span>
272+
” sign. The output of all other lines will not be shown. For
270273
instance, here is the description file of an algorithms that performs a
271274
normality test on a given field (column) of the attributes of a vector
272275
layer:</p>

‎src/sextante/help/_sources/3rdParty.txt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,26 @@ Introduction
55
------------
66

77
SEXTANTE can be extended using additional applications, calling them
8-
from within SEXTANTE. Currently, SAGA, GRASS, OTB(Orfeo Toolbox) and R are supported, along
9-
with some other command-line applications that provide spatial data
10-
analysis functionalities.
8+
from within SEXTANTE.
9+
10+
By default, algorithms coming from external applications are not activated unless SEXTANTE has checked that the corresponding applications are installed in your system and can be executed. That means that there are probably many more algorithms available than those that you can see in the toolbox, but some extra configuration is needed to have them fully operational.
11+
1112
This chapter will show you how to configure SEXTANTE to include these
1213
additional applications. Once you have correctly configured the system,
1314
you will be able to execute external algorithms from any SEXTANTE
1415
component like the toolbox or the graphical modeler, just like you do
1516
with any other SEXTANTE geoalgorithm.
1617

18+
At the time of writing this manual, SEXTANTE has two external providers activated by default: GRASS and GDAL. This providers are activated because QGIS includes both the GRASS binaries and the GDAL library files, so there is no need for further configuration (QGIS developers have done that in advance for you). This might change in other versions, but for now it means that you need to manually install and configure those external programs. Do not worry, this is very easy to do. If you are running Linux, you just have to install the software yourself and then activate the corresponding algorithm provider. If you are running Windows, you should also tell SEXTANTE the path to the software.
19+
20+
For each algorithm provider there is a group entry in the SEXTANTE configuration dialog, which contains at least an "Activate" item. Other parameters might appear if they are needed to configure the provider (mostly paths to executales and additional files). In the following sections, we will see how to set those parameters for the main providers currently available for SEXTANTE. But first, a couple of quick notes with important information about using algorithms based on external applications.
21+
22+
1723
A note on file formats
1824
~~~~~~~~~~~~~~~~~~~~~~
1925

26+
Algorithms provided by external applications have some differences when compared to "native" SEXTANTE algorithm. The main one of them is related to the file formats supported both for input and for output.
27+
2028
When using an external software, opening a file in QGIS does not mean
2129
that it can be opened and processed as well on that other software. In
2230
most cases, it can read what you have opened in QGIS, but in some cases,
@@ -76,7 +84,7 @@ SAGA
7684

7785
SAGA algorithms can be run from SEXTANTE if you have SAGA installed in
7886
your system and you configure SEXTANTE properly so it can find SAGA
79-
executables. In particular, the SAGA commandline executable is needed
87+
executables. In particular, the SAGA command-line executable is needed
8088
to run SAGA algorithms. SAGA binaries are not included with SEXTANTE, so
8189
you have to download and install the software yourself. Please check the
8290
SAGA website at for more information. SAGA 2.0.8 is needed.
@@ -160,7 +168,7 @@ the syntax to use to call those R commands from SEXTANTE and how to use
160168
SEXTANTE objects (layers, tables) in them.
161169

162170
The first thing you have to do, as we saw in the case of SAGA, is to
163-
tell SEXTANTE where you R binaries are located. You can do so using the
171+
tell SEXTANTE where your R binaries are located. You can do so using the
164172
*R folder* entry in the SEXTANTE configuration dialog. Once you have set
165173
that parameter, you can start creating your own R scripts and executing
166174
them.

‎src/sextante/help/_sources/console.txt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ that can be run from any of its components, like the toolbox or the
252252
graphical modeler.
253253

254254
These lines start with a double Python comment symbol and have the
255-
following structure: *[parameter\_name]=[parameter\_type]
256-
[optional\_values]*. Here is a list of all the parameter types that
255+
following structure: *[parameter_name]=[parameter_type]
256+
[optional_values]*. Here is a list of all the parameter types that
257257
SEXTANTE supports in its scripts, their syntax and some examples.
258258

259259
- ``raster``. A raster layer
@@ -262,7 +262,7 @@ SEXTANTE supports in its scripts, their syntax and some examples.
262262

263263
- ``table``. A table
264264

265-
- ``raster``. A numerical value. A default value must be provided. For
265+
- ``number``. A numerical value. A default value must be provided. For
266266
instance, ``depth=number 2.4``
267267

268268
- ``string``. A text string. As in the case of numerical values, a
@@ -275,9 +275,7 @@ SEXTANTE supports in its scripts, their syntax and some examples.
275275

276276
- ``multiple vector``. A set of input vector layers.
277277

278-
- ``multiple table``. A set of input tables.
279-
280-
- ``field``. A field in the attributes table of a vector layer. the
278+
- ``field``. A field in the attributes table of a vector layer. The
281279
name of the layer has to be added after the ``field`` tag. For
282280
instance, if you have declared a vector input with
283281
``mylayer=vector``, you could use ``myfield=field mylayer`` to add a
@@ -292,6 +290,8 @@ executing the algorithm, and also the variable name to use in the script
292290
code. The value entered by the user for that parameter will be assigned
293291
to a variable with that name.
294292

293+
When showing the name of the parameter to the user, SEXTANTE will edit it to improve its appearance, replacing low hyphens with blankspaces. So, for instance, if you want the user to see a parameter named ``A numerical value``, you can use the variable name ``A_numerical_value``
294+
295295
Layers and tables values are strings containing the filepath of the
296296
corresponding object. To turn them into a QGIS object, you can use the
297297
``getObject()`` method in the ``Sextante`` class. Multiple inputs also
@@ -333,5 +333,12 @@ tag.
333333

334334
Several examples are provided with SEXTANTE. Please, check them to see
335335
real examples of how to create algorithms using this feature of
336-
SEXTANTE. You can rightclick on any script algorithm and select *Edit
336+
SEXTANTE. You can right-click on any script algorithm and select *Edit
337337
script* to edit its code or just to see it.
338+
339+
Communicating with the user
340+
----------------------------
341+
342+
You can send messages to the user to inform about the progress of the algorithm. To do so, just print whatever information you want to show in the textbox above the progress bar in the algorithm dialog, using the ``print`` command. For instance, just use ``print "Processing polygon layer"`` and the text will be redirected to that textbox.
343+
344+
If the text you print is just a number between 0 and 100, it will be understood as the percentage of the process that has been already finished, and instead of redirecting the text to the textbox, the progress bar will be update to that percentage of completion.

‎src/sextante/help/console.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,16 +273,15 @@ <h2>Creating scripts and running them from the toolbox<a class="headerlink" href
273273
<li><tt class="docutils literal"><span class="pre">raster</span></tt>. A raster layer</li>
274274
<li><tt class="docutils literal"><span class="pre">vector</span></tt>. A vector layer</li>
275275
<li><tt class="docutils literal"><span class="pre">table</span></tt>. A table</li>
276-
<li><tt class="docutils literal"><span class="pre">raster</span></tt>. A numerical value. A default value must be provided. For
276+
<li><tt class="docutils literal"><span class="pre">number</span></tt>. A numerical value. A default value must be provided. For
277277
instance, <tt class="docutils literal"><span class="pre">depth=number</span> <span class="pre">2.4</span></tt></li>
278278
<li><tt class="docutils literal"><span class="pre">string</span></tt>. A text string. As in the case of numerical values, a
279279
default value must be added. For instance, <tt class="docutils literal"><span class="pre">name=string</span> <span class="pre">Victor</span></tt></li>
280280
<li><tt class="docutils literal"><span class="pre">boolean</span></tt>. A boolean value. Add <tt class="docutils literal"><span class="pre">True</span></tt> or <tt class="docutils literal"><span class="pre">False</span></tt> after it to
281281
set the default value. For example, <tt class="docutils literal"><span class="pre">verbose=boolean</span> <span class="pre">True</span></tt></li>
282282
<li><tt class="docutils literal"><span class="pre">multiple</span> <span class="pre">raster</span></tt>. A set of input raster layers.</li>
283283
<li><tt class="docutils literal"><span class="pre">multiple</span> <span class="pre">vector</span></tt>. A set of input vector layers.</li>
284-
<li><tt class="docutils literal"><span class="pre">multiple</span> <span class="pre">table</span></tt>. A set of input tables.</li>
285-
<li><tt class="docutils literal"><span class="pre">field</span></tt>. A field in the attributes table of a vector layer. the
284+
<li><tt class="docutils literal"><span class="pre">field</span></tt>. A field in the attributes table of a vector layer. The
286285
name of the layer has to be added after the <tt class="docutils literal"><span class="pre">field</span></tt> tag. For
287286
instance, if you have declared a vector input with
288287
<tt class="docutils literal"><span class="pre">mylayer=vector</span></tt>, you could use <tt class="docutils literal"><span class="pre">myfield=field</span> <span class="pre">mylayer</span></tt> to add a
@@ -294,6 +293,7 @@ <h2>Creating scripts and running them from the toolbox<a class="headerlink" href
294293
executing the algorithm, and also the variable name to use in the script
295294
code. The value entered by the user for that parameter will be assigned
296295
to a variable with that name.</p>
296+
<p>When showing the name of the parameter to the user, SEXTANTE will edit it to improve its appearance, replacing low hyphens with blankspaces. So, for instance, if you want the user to see a parameter named <tt class="docutils literal"><span class="pre">A</span> <span class="pre">numerical</span> <span class="pre">value</span></tt>, you can use the variable name <tt class="docutils literal"><span class="pre">A_numerical_value</span></tt></p>
297297
<p>Layers and tables values are strings containing the filepath of the
298298
corresponding object. To turn them into a QGIS object, you can use the
299299
<tt class="docutils literal"><span class="pre">getObject()</span></tt> method in the <tt class="docutils literal"><span class="pre">Sextante</span></tt> class. Multiple inputs also
@@ -326,9 +326,14 @@ <h2>Creating scripts and running them from the toolbox<a class="headerlink" href
326326
tag.</p>
327327
<p>Several examples are provided with SEXTANTE. Please, check them to see
328328
real examples of how to create algorithms using this feature of
329-
SEXTANTE. You can rightclick on any script algorithm and select <em>Edit
329+
SEXTANTE. You can right-click on any script algorithm and select <em>Edit
330330
script</em> to edit its code or just to see it.</p>
331331
</div>
332+
<div class="section" id="communicating-with-the-user">
333+
<h2>Communicating with the user<a class="headerlink" href="#communicating-with-the-user" title="Permalink to this headline"></a></h2>
334+
<p>You can send messages to the user to inform about the progress of the algorithm. To do so, just print whatever information you want to show in the textbox above the progress bar in the algorithm dialog, using the <tt class="docutils literal"><span class="pre">print</span></tt> command. For instance, just use <tt class="docutils literal"><span class="pre">print</span> <span class="pre">&quot;Processing</span> <span class="pre">polygon</span> <span class="pre">layer&quot;</span></tt> and the text will be redirected to that textbox.</p>
335+
<p>If the text you print is just a number between 0 and 100, it will be understood as the percentage of the process that has been already finished, and instead of redirecting the text to the textbox, the progress bar will be update to that percentage of completion.</p>
336+
</div>
332337
</div>
333338

334339

@@ -343,6 +348,7 @@ <h3><a href="index.html">Table Of Contents</a></h3>
343348
<li><a class="reference internal" href="#introduction">Introduction</a></li>
344349
<li><a class="reference internal" href="#calling-sextante-from-the-python-console">Calling SEXTANTE from the Python console</a></li>
345350
<li><a class="reference internal" href="#creating-scripts-and-running-them-from-the-toolbox">Creating scripts and running them from the toolbox</a></li>
351+
<li><a class="reference internal" href="#communicating-with-the-user">Communicating with the user</a></li>
346352
</ul>
347353
</li>
348354
</ul>

‎src/sextante/help/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ <h1>SEXTANTE for QGIS&#8217;s documentation<a class="headerlink" href="#sextante
8989
<li class="toctree-l2"><a class="reference internal" href="console.html#introduction">Introduction</a></li>
9090
<li class="toctree-l2"><a class="reference internal" href="console.html#calling-sextante-from-the-python-console">Calling SEXTANTE from the Python console</a></li>
9191
<li class="toctree-l2"><a class="reference internal" href="console.html#creating-scripts-and-running-them-from-the-toolbox">Creating scripts and running them from the toolbox</a></li>
92+
<li class="toctree-l2"><a class="reference internal" href="console.html#communicating-with-the-user">Communicating with the user</a></li>
9293
</ul>
9394
</li>
9495
<li class="toctree-l1"><a class="reference internal" href="history.html">The SEXTANTE history manager</a></li>

‎src/sextante/help/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/sextante/lidar/LidarToolsAlgorithmProvider.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class LidarToolsAlgorithmProvider(AlgorithmProvider):
3535

3636
def __init__(self):
3737
AlgorithmProvider.__init__(self)
38+
self.activate = False
3839
self.algsList = []
3940
if SextanteUtils.isWindows():
4041
lastools = [las2shp(), lasboundary(), las2dem(), las2iso(), lasgrid(), lasground(),

‎src/sextante/modeler/ModelerParametersDialog.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from sextante.outputs.OutputNumber import OutputNumber
2323
from sextante.parameters.ParameterFile import ParameterFile
2424
from sextante.outputs.OutputFile import OutputFile
25-
from sextante.gui.HTMLViewerDialog import HTMLViewerDialog
2625
from sextante.core.WrongHelpFileException import WrongHelpFileException
2726

2827
class ModelerParametersDialog(QtGui.QDialog):

‎src/sextante/otb/OTBAlgorithmProvider.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class OTBAlgorithmProvider(AlgorithmProvider):
1010

1111
def __init__(self):
1212
AlgorithmProvider.__init__(self)
13+
self.activate = False
1314
self.createAlgsList()
1415

1516

‎src/sextante/r/RAlgorithmProvider.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
class RAlgorithmProvider(AlgorithmProvider):
1616

1717
def __init__(self):
18-
self.actions = []
18+
AlgorithmProvider.__init__(self)
19+
self.activate = False
1920
self.actions.append(CreateNewRScriptAction())
2021
self.contextMenuActions = [EditRScriptAction()]
2122

‎src/sextante/saga/SagaAlgorithmProvider.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
1313

1414
def __init__(self):
1515
AlgorithmProvider.__init__(self)
16+
self.activate = False
1617
self.createAlgsList() #preloading algorithms to speed up
1718

1819
def initializeSettings(self):

0 commit comments

Comments
 (0)
Please sign in to comment.