Merge branch 'dev' of github.com:Loop3D/LoopStructural into dev

Author: lachlangrose

LoopStructural/__init__.py

@@ -31,7 +31,7 @@
 ch.setFormatter(formatter)
 ch.setLevel(logging.WARNING)
 loggers = {}
-__version__ = '1.0.5'
+__version__ = '1.0.6-dev'
 from .modelling.core.geological_model import GeologicalModel
 from .visualisation.model_visualisation import LavaVuModelViewer
 from .visualisation.map_viewer import MapView

LoopStructural/visualisation/model_visualisation.py

@@ -147,29 +147,26 @@ def add_section(self, geological_feature=None, axis='x', value=None, **kwargs):
         -------
 
         """
-        print('aa')
         if axis == 'x':
             tri, yy, zz = create_surface(self.bounding_box[:, [1, 2]], self.nsteps[[1, 2]])
             xx = np.zeros(zz.shape)
             if value is None:
-                xx[:] = np.nanmean(self.bounding_box[:, 0])
-            else:
-                xx[:] = value
+                value = np.nanmean(self.bounding_box[:, 0])
+            xx[:] = value
         if axis == 'y':
             tri, xx, zz = create_surface(self.bounding_box[:, [0, 2]], self.nsteps[[0, 2]])
             yy = np.zeros(xx.shape)
             if value is None:
-                yy[:] = np.nanmean(self.bounding_box[:, 1])
-            else:
-                yy[:] = value
+                value = np.nanmean(self.bounding_box[:, 1])
+            yy[:] = value
         if axis == 'z':
             tri, xx, yy = create_surface(self.bounding_box[:, 0:2], self.nsteps[0:2])
             zz = np.zeros(xx.shape)
             if value is None:
-                zz[:] = np.nanmean(self.bounding_box[:, 2])
-            else:
-                zz[:] = value
-        name = kwargs.get('name', axis + '_slice')
+                value = np.nanmean(self.bounding_box[:, 2])
+            zz[:] = value
+        name = kwargs.get('name', geological_feature.name)
+        name = '{}_section_at_{}_of_{}'.format(axis,value,name)
         colour = kwargs.get('colour', 'red')
 
         # create an array to evaluate the feature on for the section
@@ -208,9 +205,7 @@ def add_section(self, geological_feature=None, axis='x', value=None, **kwargs):
             cmap = lavavu.cubehelix(100)
             if 'cmap' in kwargs:
                 cmap = kwargs['cmap']
-            # logger.info("Colouring section with %s min: %f, max: %f" % (
-            #     geological_feature.name, geological_feature.min(), geological_feature.max()))
-            # surf.colourmap(cmap, range=[geological_feature.min(), geological_feature.max()])
+
     def add_isosurface(self, geological_feature, value = None, isovalue=None,
                      paint_with=None, slices=None, colour='red', nslices=None, 
                      cmap=None, filename=None, names=None, colours=None,**kwargs):