Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wxGUI: Fix F405 error by explicitly importing required modules in iscatt/ #4426

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+25 −6
Open

wxGUI: Fix F405 error by explicitly importing required modules in iscatt/ #4426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a131bc1
update 405 in core_c
Sep 30, 2024
cc355e8
updated flake8
Oct 1, 2024
90d4cfd
support explicit imports
Oct 1, 2024
8122126
Merge branch 'main' into 405-core_c
arohanajit Oct 1, 2024
fa8c4f0
ran isort to make sort imports
Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ per-file-ignores =
doc/gui/wxpython/example/dialogs.py: F401
gui/scripts/d.wms.py: E501
gui/wxpython/image2target/*: F841, E722
gui/wxpython/image2target/g.gui.image2target.py: E501
gui/wxpython/iscatt/*: F841, E722, F405, F403
gui/wxpython/image2target/g.gui.image2target.py: E501, F841
gui/wxpython/iscatt/*: F841, E722
gui/wxpython/lmgr/frame.py: F841, E722
# layertree still includes some formatting issues (it is ignored by Black)
gui/wxpython/lmgr/layertree.py: E722, E266, W504, E225
Expand Down
27 changes: 23 additions & 4 deletions gui/wxpython/iscatt/core_c.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,34 @@
@author Stepan Turek <stepan.turek seznam.cz> (mentor: Martin Landa)
"""

import ctypes
import sys
import numpy as np
from ctypes import POINTER, c_char_p, c_double, c_int, c_uint8, pointer
from multiprocessing import Process, Queue

from ctypes import *
import numpy as np

try:
from grass.lib.imagery import *
from grass.lib.gis import G_get_window
from grass.lib.imagery import (
SC_SCATT_CONDITIONS,
SC_SCATT_DATA,
I_apply_colormap,
I_compute_scatts,
I_create_cat_rast,
I_insert_patch_to_cat_rast,
I_merge_arrays,
I_rasterize,
I_sc_add_cat,
I_sc_free_cats,
I_sc_init_cats,
I_sc_insert_scatt_data,
I_scd_init_scatt_data,
scdScattData,
struct_Cell_head,
struct_Range,
struct_scCats,
)
except ImportError as e:
sys.stderr.write(_("Loading ctypes libs failed"))

Expand Down Expand Up @@ -238,7 +257,7 @@ def _getComputationStruct(cats, cats_rasts, cats_type, n_bands):

scatt_vals = scdScattData()

c_void_p = ctypes.POINTER(ctypes.c_void_p)
c_void_p = POINTER(ctypes.c_void_p)

if cats_type == SC_SCATT_DATA:
vals[:] = 0
Expand Down
Loading