Skip to content

Commit 983535f

Browse files
volayavolaya
committedNov 5, 2012
fixed #6571, #6619 and problem with missing arrows in modeler
added first draft of geoserver tools nviz is back in grass tools
·
ltr-3_40Before-merge-new_vector_api
1 parent a4e4999 commit 983535f

Some content is hidden

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

46 files changed

+4203
-278
lines changed
 

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ qgis-test.ctest
4545
i18n/*.qm
4646
.project
4747
.pydevproject
48-
.idea
48+
.idea
49+
/python/plugins/sextante/resources_rc.py
50+
/python/plugins/sextante/about/ui_aboutdialogbase.py

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* *
1717
***************************************************************************
1818
"""
19+
from sextante.servertools.GeoServerToolsAlgorithmProvider import GeoServerToolsAlgorithmProvider
1920

2021

2122
__author__ = 'Victor Olaya'
@@ -130,6 +131,7 @@ def initialize():
130131
Sextante.addProvider(GrassAlgorithmProvider())
131132
Sextante.addProvider(ScriptAlgorithmProvider())
132133
Sextante.addProvider(TauDEMAlgorithmProvider())
134+
Sextante.addProvider(GeoServerToolsAlgorithmProvider())
133135
Sextante.modeler.initializeSettings();
134136
#and initialize
135137
SextanteLog.startLogging()

7 commit comments

Comments
 (7)

slarosa commented on Nov 5, 2012

@slarosa
slarosa
on Nov 5, 2012
Member

Hi Victor,
Sextante seems broken to this revision !
Can you take a look at it, please ?

volaya commented on Nov 5, 2012

@volaya
volaya
on Nov 5, 2012
ContributorAuthor

volaya commented on Nov 5, 2012

@volaya
volaya
on Nov 5, 2012
ContributorAuthor

dakcarto commented on Nov 5, 2012

@dakcarto
dakcarto
on Nov 5, 2012
Member

Hi Victor,

Don't know if it is related to this commit, but now getting the following on Sextante load, at launch of QGIS:

Couldn't load plugin sextante due an error when calling its classFactory() method

Traceback (most recent call last):
  File "/Users/larrys/QGIS/github.com/build/output/python/qgis/utils.py", line 188, in startPlugin
    plugins[packageName] = package.classFactory(iface)
  File "/Users/larrys/QGIS/github.com/build/output/python/plugins/sextante/__init__.py", line 45, in classFactory
    from sextante.SextantePlugin import SextantePlugin
  File "/Users/larrys/QGIS/github.com/build/output/python/qgis/utils.py", line 384, in _import
    mod = _builtin_import(name, globals, locals, fromlist, level)
  File "/Users/larrys/QGIS/github.com/build/output/python/plugins/sextante/SextantePlugin.py", line 34, in 
    from sextante.core.Sextante import Sextante
  File "/Users/larrys/QGIS/github.com/build/output/python/qgis/utils.py", line 384, in _import
    mod = _builtin_import(name, globals, locals, fromlist, level)
  File "/Users/larrys/QGIS/github.com/build/output/python/plugins/sextante/core/Sextante.py", line 19, in 
    from sextante.servertools.GeoServerToolsAlgorithmProvider import GeoServerToolsAlgorithmProvider
  File "/Users/larrys/QGIS/github.com/build/output/python/qgis/utils.py", line 384, in _import
    mod = _builtin_import(name, globals, locals, fromlist, level)
ImportError: No module named servertools.GeoServerToolsAlgorithmProvider

slarosa commented on Nov 5, 2012

@slarosa
slarosa
on Nov 5, 2012
Member

Doesn't work here !

Traceback (most recent call last):
File "/usr/local/share/qgis/python/qgis/utils.py", line 188, in startPlugin
plugins[packageName] = package.classFactory(iface)
File "/usr/local/share/qgis/python/plugins/sextante/init.py", line 45, in classFactory
from sextante.SextantePlugin import SextantePlugin
File "/usr/local/share/qgis/python/qgis/utils.py", line 384, in _import
mod = _builtin_import(name, globals, locals, fromlist, level)
File "/usr/local/share/qgis/python/plugins/sextante/SextantePlugin.py", line 34, in
from sextante.core.Sextante import Sextante
File "/usr/local/share/qgis/python/qgis/utils.py", line 384, in _import
mod = _builtin_import(name, globals, locals, fromlist, level)
File "/usr/local/share/qgis/python/plugins/sextante/core/Sextante.py", line 19, in
from sextante.servertools.GeoServerToolsAlgorithmProvider import GeoServerToolsAlgorithmProvider
File "/usr/local/share/qgis/python/qgis/utils.py", line 384, in _import
mod = _builtin_import(name, globals, locals, fromlist, level)
ImportError: No module named servertools.GeoServerToolsAlgorithmProvider

volaya commented on Nov 5, 2012

@volaya
volaya
on Nov 5, 2012
ContributorAuthor

Ok, I think I fixed it. I forgot to add the folder to the cmakelists file, so it was not being built. Since I work with a 1.8 install and not with the git version, I could not see the problem (I have my own ant task to do the deploying). Now it should copy the new folder as well and everything should be fine :-)

Sorry for this

slarosa commented on Nov 6, 2012

@slarosa
slarosa
on Nov 6, 2012
Member

...and to get it to work ;-) , add CMakeLists.txt in dir servertools:

FILE(GLOB PY_FILES *.py)

ADD_SUBDIRECTORY(geoserver)
ADD_SUBDIRECTORY(httplib2)

PLUGIN_INSTALL(sextante servertools ${PY_FILES})

in geoserver dir:

FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(sextante servertools/geoserver ${PY_FILES})

and finally httplib2 dir:

FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(sextante servertools/httplib2 ${PY_FILES})

this should solve the problem !

Thanks !

Please sign in to comment.