Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hru-delin-dev
hru-delin-qgis
Commits
d043ebf1
Unverified
Commit
d043ebf1
authored
Apr 22, 2020
by
Julien Veyssier
Browse files
a few adjustments
Signed-off-by:
Julien Veyssier
<
eneiluj@posteo.net
>
parent
3e59001e
Changes
3
Hide whitespace changes
Inline
Side-by-side
hrudelinCore
@
69e355f0
Compare
61094506
...
69e355f0
Subproject commit 6
1094506b720b242482d755032eec0a8eb1c68d4
Subproject commit 6
9e355f0d8cbf11b9bbb8bb1ee0d67289dcd8b7d
hrudelin_dockwidget.py
View file @
d043ebf1
...
...
@@ -49,7 +49,7 @@ if platform.system() == 'Windows':
path
=
os
.
path
.
abspath
(
os
.
path
.
join
(
sys
.
exec_prefix
,
'../../bin/pythonw3.exe'
))
multiprocessing
.
set_executable
(
path
)
sys
.
argv
=
[
None
]
print
(
'fix in plugin %s'
%
os
.
path
.
abspath
(
os
.
path
.
join
(
sys
.
exec_prefix
,
'../../bin/pythonw3.exe'
)))
print
(
'fix
multiprocess for windows
in plugin %s'
%
os
.
path
.
abspath
(
os
.
path
.
join
(
sys
.
exec_prefix
,
'../../bin/pythonw3.exe'
)))
prepareGrassEnv
()
from
hrudelin.hrudelinCore.modules.hrudelin_1_init
import
main
as
main1
...
...
@@ -506,7 +506,7 @@ class HruDelinDockWidget(QtWidgets.QDockWidget, FORM_CLASS):
def
step1FinishedAuto
(
self
):
self
.
step1Finished
()
self
.
doStep2
(
True
,
self
.
step2FinishedAuto
)
#
self.doStep2(True, self.step2FinishedAuto)
# called when step2 ended during a full run
# it will chain with the rest of the run
...
...
pluginUtils/tools.py
View file @
d043ebf1
...
...
@@ -44,13 +44,11 @@ def prepareGrassEnv():
break
except
Exception
as
e
:
pass
print
(
'found winwin %s !!!'
%
grassBasePath
)
elif
isMac
():
pass
else
:
grassBasePath
=
subprocess
.
check_output
([
'grass'
,
'--config'
,
'path'
]).
decode
(
'utf-8'
).
rstrip
(
os
.
linesep
)
print
(
'found first %s !!!'
%
grassBasePath
)
if
grassBasePath
==
None
:
for
grassVersion
in
[
'74'
,
'75'
,
'76'
,
'77'
,
'78'
,
'79'
]:
findRes
=
list
(
Path
(
'/usr/lib/grass%s'
%
grassVersion
).
rglob
(
'*r.thin*'
))
...
...
@@ -64,6 +62,8 @@ def prepareGrassEnv():
raise
Exception
(
'GRASS not found on your system'
)
return
print
(
'found grass root %s'
%
grassBasePath
)
grassPythonPath
=
os
.
path
.
join
(
grassBasePath
,
'etc'
,
'python'
)
if
grassPythonPath
not
in
sys
.
path
:
sys
.
path
.
append
(
grassPythonPath
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment