Merge pull request #68 from hsorby/main

Tidy up some code in FixedAxisTranslation.

Author: hsorby

src/cmlibs/widgets/handlers/fixedaxistranslation.py

@@ -43,20 +43,16 @@ def set_model(self, model):
             self._reverse_glyphs = []
             self._glyph_fields = []
 
+            self._initialise_materials()
+
             region = model.get_projection_plane_region()
             field_module = region.getFieldmodule()
             scene = region.getScene()
-            self._glyph_fields.append(field_module.createFieldConstant([0, 0, 0]))
-            self._glyph_fields.append(field_module.createFieldConstant([0, 0, 0]))
-            self._glyph_fields.append(field_module.createFieldConstant([0, 0, 0]))
-            self._glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[0], size=AXIS_ARROW_SIZE))
-            self._glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[1], size=AXIS_ARROW_SIZE))
-            self._glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[2], size=AXIS_ARROW_SIZE))
-            self._reverse_glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[0], size=-AXIS_ARROW_SIZE))
-            self._reverse_glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[1], size=-AXIS_ARROW_SIZE))
-            self._reverse_glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[2], size=-AXIS_ARROW_SIZE))
 
-            self._initialise_materials()
+            for i in range(3):
+                self._glyph_fields.append(field_module.createFieldConstant([0, 0, 0]))
+                self._glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[i], size=AXIS_ARROW_SIZE, material=self._default_material))
+                self._reverse_glyphs.append(create_plane_manipulation_arrow(scene, self._glyph_fields[i], size=-AXIS_ARROW_SIZE, material=self._default_material))
 
         else:
             raise HandlerError('Given model does not have the required API for handling translation.')
@@ -71,17 +67,13 @@ def enter(self):
         x_vector, y_vector = _calculate_orthogonal_vectors(self._model.plane_nodes_coordinates())
         normal = self._model.get_plane_normal()
 
-        x_field_cache = self._glyph_fields[0].getFieldmodule().createFieldcache()
-        y_field_cache = self._glyph_fields[1].getFieldmodule().createFieldcache()
-        normal_field_cache = self._glyph_fields[2].getFieldmodule().createFieldcache()
-        self._glyph_fields[0].assignReal(x_field_cache, x_vector.tolist())
-        self._glyph_fields[1].assignReal(y_field_cache, y_vector.tolist())
-        self._glyph_fields[2].assignReal(normal_field_cache, normal)
+        field_cache = self._glyph_fields[0].getFieldmodule().createFieldcache()
+        for i, vector in enumerate([x_vector, y_vector, normal]):
+            self._glyph_fields[i].assignReal(field_cache, vector)
 
         centroid = calculate_centroid(self._model.plane_nodes_coordinates())
         for glyph in (self._glyphs + self._reverse_glyphs):
             glyph.setVisibilityFlag(True)
-            glyph.setMaterial(self._default_material)
             set_glyph_position(glyph, centroid)
 
     def leave(self):
@@ -105,6 +97,7 @@ def mouse_press_event(self, event):
                     self._selected_index = i
                     self._glyphs[i].setMaterial(self._selected_material)
                     self._reverse_glyphs[i].setMaterial(self._selected_material)
+                    break
 
     def mouse_move_event(self, event):
         if self._selected_index is not None:
@@ -139,8 +132,9 @@ def mouse_move_event(self, event):
     def mouse_release_event(self, event):
         super().mouse_release_event(event)
 
-        for glyph in (self._glyphs + self._reverse_glyphs):
-            glyph.setMaterial(self._default_material)
+        if self._selected_index is not None:
+            self._glyphs[self._selected_index].setMaterial(self._default_material)
+            self._reverse_glyphs[self._selected_index].setMaterial(self._default_material)
 
         self._start_position = None
         self._selected_index = None
@@ -153,4 +147,6 @@ def _calculate_orthogonal_vectors(points):
     vectors.pop(max_index)
     lengths.pop(max_index)
 
-    return (vectors[0] / lengths[0]), (vectors[1] / lengths[1])
+    x_vector = vectors[0] / lengths[0]
+    y_vector = vectors[1] / lengths[1]
+    return x_vector.tolist(), y_vector.tolist()