(VISUALISATION) added orientation disks instead of vectors

for orientation data. Vectors can be used by specifying vectors=True, and disks can
be turned off disks=False when using
.add_data(feature,disks,vectors)

Author: lachlangrose

LoopStructural/modelling/core/geological_model.py

@@ -112,6 +112,7 @@ def __init__(self, origin, maximum, rescale=True, nsteps=(40, 40, 40),
 
 
         """
+        # print('tet')
         if logfile:
             self.logfile = logfile
             log_to_file(logfile,loglevel)

LoopStructural/visualisation/model_visualisation.py

@@ -629,7 +629,7 @@ def add_vector_field(self, geological_feature, **kwargs):
         vectorfield.vectors(vector[mask, :])
         return
 
-    def add_data(self, feature, **kwargs):
+    def add_data(self, feature, disks=True, vectors = False,**kwargs):
         """
 
         Plot the data linked to the feature, can choose whether to plot all data types
@@ -667,12 +667,20 @@ def add_data(self, feature, **kwargs):
         interface = feature.builder.get_interface_constraints()
 
         if grad.shape[0] > 0 and add_grad:
-            self.add_vector_data(self.model.rescale(grad[:, :3],inplace=False), grad[:, 3:6], name + "_grad_cp",
+            if disks:
+                self.add_orientation_disks(self.model.rescale(grad[:, :3],inplace=False), grad[:, 3:6], name + "_grad_cp",
                                  **kwargs)
+            if vectors:
+                self.add_vector_data(self.model.rescale(grad[:, :3],inplace=False), grad[:, 3:6], name + "_grad_cp",
+                                    **kwargs)
 
         if norm.shape[0] > 0 and add_grad:
-            self.add_vector_data(self.model.rescale(norm[:, :3],inplace=False), norm[:, 3:6], name + "_norm_cp",
+            if disks:
+                self.add_orientation_disks(self.model.rescale(norm[:, :3],inplace=False), norm[:, 3:6], name + "_norm_cp",
                                  **kwargs)
+            if vectors:
+                self.add_vector_data(self.model.rescale(norm[:, :3],inplace=False), norm[:, 3:6], name + "_norm_cp",
+                                    **kwargs)
         if value.shape[0] > 0 and add_value:
             kwargs['range'] = [feature.min(), feature.max()]
             self.add_value_data(self.model.rescale(value[:, :3],inplace=False), value[:, 3], name + "_value_cp",
@@ -744,6 +752,18 @@ def add_vector_data(self, position, vector, name, **kwargs):
             vectorfield.vertices(position)
             vectorfield.vectors(vector)
             return
+    def add_orientation_disks(self,position,vector,name,symb_scale=1.,scaleshapes=None,shapelength=0,**kwargs):
+        if 'colour' not in kwargs:
+            kwargs['colour'] = 'black'
+        # normalise
+        if scaleshapes is None:
+            scaleshapes = np.max(self.model.maximum-self.model.origin)*0.014*symb_scale
+        if position.shape[0] > 0:
+            vector /= np.linalg.norm(vector, axis=1)[:, None]
+            vectorfield = self.lv.shapes(name, scaleshapes=scaleshapes,shapelength=shapelength,**kwargs)
+            vectorfield.vertices(position)
+            vectorfield.vectors(vector)
+            return
 
     def add_value_data(self, position, value, name, **kwargs):
         """