Skip to content

Commit 15d12c6

Browse files
committed
reorganize operators files
1 parent 96c2e0a commit 15d12c6

Some content is hidden

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

55 files changed

+1080
-1076
lines changed

__init__.py

+3-9
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,7 @@
4242
#Import all modules which contains classes that must be registed (classes derived from bpy.types.*)
4343
from . import prefs
4444
from . import geoscene
45-
from .basemaps import mapviewer
46-
from .misc import view3d_setGeorefCam, view3d_setCamFromExif
47-
from .delaunay_voronoi import delaunayVoronoiBlender
48-
from .io_georaster import op_import_georaster, op_get_srtm
49-
from .io_shapefile import op_export_shp, op_import_shp
50-
from .osm import op_import_osm
51-
from .terrain_analysis import nodes_builder, reclassify
45+
from .operators import * #see operators/__init__/__all__
5246

5347

5448
import bpy.utils.previews as iconsLib
@@ -125,7 +119,7 @@ def register():
125119
icons_dict.load(name, os.path.join(icons_dir, icon), 'IMAGE')
126120

127121
#operators
128-
reclassify.register() #this module has its own register function because it contains PropertyGroup that must be specifically registered
122+
nodes_terrain_analysis_reclassify.register() #this module has its own register function because it contains PropertyGroup that must be specifically registered
129123
bpy.utils.register_module(__name__) #register all imported operators of the current module
130124

131125
#menus
@@ -158,7 +152,7 @@ def unregister():
158152
kmi = km.keymap_items.remove(km.keymap_items['view3d.map_start'])
159153
#>>cause warnings prints : "search for unknown operator 'VIEW3D_OT_map_start', 'VIEW3D_OT_map_start' "
160154

161-
reclassify.unregister()
155+
nodes_terrain_analysis_reclassify.unregister()
162156
bpy.utils.unregister_module(__name__)
163157

164158
if __name__ == "__main__":

core/settings.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"proj_engine": "AUTO",
3-
"img_engine": "AUTO"
2+
"img_engine": "AUTO",
3+
"proj_engine": "AUTO"
44
}

operators/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__all__ = ["add_camera_exif", "add_camera_georef", "io_export_shp", "io_get_srtm", "io_import_georaster", "io_import_osm", "io_import_shp", "mesh_delaunay_voronoi", "nodes_terrain_analysis_builder", "nodes_terrain_analysis_reclassify", "view3d_mapviewer"]

misc/view3d_setCamFromExif.py renamed to operators/add_camera_exif.py

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
#bgis
2828
from ..geoscene import GeoScene
29+
30+
#core
2931
from ..core.proj import reprojPt
3032
from ..core.georaster import getImgFormat
3133

0 commit comments

Comments
 (0)