More work on rotate method for objects.

gprMax/cmds_geometry/cmds_geometry.py

@@ -102,15 +102,15 @@ def rotate_2point_object(pts, axis, angle, origin=None):
     # Check angle value is suitable
     angle = int(angle)
     if angle < 0 or angle > 360:
-        logger.exception(self.__str__() + ' angle of rotation must be between 0-360 degrees')
+        logger.exception('Angle of rotation must be between 0-360 degrees')
         raise ValueError
     if angle % 90 != 0:
-        logger.exception(self.__str__() + ' angle of rotation must be a multiple of 90 degrees')
+        logger.exception('Angle of rotation must be a multiple of 90 degrees')
         raise ValueError
 
     # Check axis is valid
     if axis != 'x' and axis != 'y' and axis != 'z':
-        logger.exception(self.__str__() + ' axis of rotation must be x, y, or z')
+        logger.exception('Axis of rotation must be x, y, or z')
         raise ValueError
 
     # Save original points

gprMax/cmds_geometry/triangle.py

@@ -22,7 +22,7 @@ import numpy as np
 
 from ..cython.geometry_primitives import build_triangle
 from ..materials import Material
-from .cmds_geometry import UserObjectGeometry
+from .cmds_geometry import UserObjectGeometry, rotate_point
 
 logger = logging.getLogger(__name__)
 
@@ -51,8 +51,12 @@ class Triangle(UserObjectGeometry):
         self.hash = '#triangle'
 
     def rotate(self, axis, angle, origin=None):
-        logger.debug('Add rotate method.')
-        pass
+        p1 = rotate_point(self.kwargs['p1'], axis, angle, origin)
+        p2 = rotate_point(self.kwargs['p2'], axis, angle, origin)
+        p3 = rotate_point(self.kwargs['p3'], axis, angle, origin)
+        self.kwargs['p1'] = tuple(p1)
+        self.kwargs['p2'] = tuple(p2)
+        self.kwargs['p3'] = tuple(p3)
 
     def create(self, grid, uip):
         try:

gprMax/cmds_multiuse.py

@@ -571,8 +571,8 @@ class Rx(UserObjectMulti):
 
         # If specific field components are specified, set to output all components
         try:
-            ID = self.kwargs['id']
-            outputs = [self.kwargs['outputs']]
+            self.kwargs['id']
+            self.kwargs['outputs']
             rxargs = dict(self.kwargs)
             del rxargs['outputs']
             self.kwargs = rxargs