PEP8 conformace. Set default plane normal to [0, 0, 1].

Author: hsorby

mapclientplugins/segmentationstep/maths/algorithms.py

@@ -23,6 +23,7 @@
 from mapclientplugins.segmentationstep.maths.vectorops import add, cross, div, dot, normalize, sub, mult
 from mapclientplugins.segmentationstep.misc import checkRange
 
+
 def boundCoordinatesToCuboid(pt1, pt2, cuboid_dimensions):
     '''
     Takes two points and a cuboids dimensions, with 
@@ -63,6 +64,7 @@ def boundCoordinatesToCuboid(pt1, pt2, cuboid_dimensions):
 
     return bounded_pt
 
+
 def pointOutsideCuboid(pt, cuboid_dimensions):
     '''
     Determine if the given point is outside the cuboid and 
@@ -86,6 +88,7 @@ def pointOutsideCuboid(pt, cuboid_dimensions):
 
     return outside
 
+
 def calculateLinePlaneIntersection(pt1, pt2, point_on_plane, plane_normal):
     line_direction = sub(pt2, pt1)
     d = dot(sub(point_on_plane, pt1), plane_normal) / dot(line_direction, plane_normal)
@@ -95,6 +98,7 @@ def calculateLinePlaneIntersection(pt1, pt2, point_on_plane, plane_normal):
 
     return None
 
+
 def calculateCentroid(point_on_plane, plane_normal, cuboid_dimensions):
     '''
     Takes a description of a plane as a point on the plane 
@@ -143,6 +147,7 @@ def calculateCentroid(point_on_plane, plane_normal, cuboid_dimensions):
     plane_centre = ca.compute()
     return plane_centre
 
+
 class CentroidAlgorithm(object):
 
     def __init__(self, xi):
@@ -227,12 +232,14 @@ def _calculateCxCy(vertices, area):
     cy /= 6 * area
     return cx, cy
 
+
 def _calculatePolygonArea(vertices):
     area = 0.0
     for i in range(len(vertices) - 1):
         area += (vertices[i][0] * vertices[i + 1][1] - vertices[i + 1][0] * vertices[i][1])
     return 0.5 * area
 
+
 def _calculateHeading(direction):
     '''
     Convert a vector based direction into a heading

mapclientplugins/segmentationstep/model/image.py

@@ -26,6 +26,7 @@
 from mapclientplugins.segmentationstep.zincutils import createFiniteElementField, createFiniteElement
 from mapclientplugins.segmentationstep.misc import alphanum_key
 
+
 class ImageModel(AbstractModel):
     '''
     A model of the image region containing a 
@@ -45,6 +46,7 @@ def __init__(self, context):
 
     def loadImages(self, dataIn):
         self._image_field = self._createImageField(dataIn)
+        self._dimensions_px = self._image_field.getSizeInPixels(3)[1]
 
     def initialize(self):
         scale = [1.0, 1.0, 1.0]
@@ -230,15 +232,11 @@ def _createImageField(self, dataIn):
                 # We are reading in a file from the local disk so our resource is a file.
                 absolute_filename = os.path.join(directory, filename)
                 if os.path.isfile(absolute_filename):
-                    # SWIG cannot handle unicode strings or rather the Zinc interface
-                    # files cannot handle unicode strings so we convert them to ascii
-                    # here.
                     stream_information.createStreamresourceFile(absolute_filename)
 
         # Actually read in the image file into the image field.
         image_field.read(stream_information)
 
-        self._dimensions_px = image_field.getSizeInPixels(3)[1]
         return image_field
 
     def _setImageTextureSize(self, size):

mapclientplugins/segmentationstep/plane.py

@@ -99,7 +99,7 @@ def getAttitude(self):
 
 
 def _createNormalField(fieldmodule):
-    plane_normal_field = fieldmodule.createFieldConstant([1, 0, 0])
+    plane_normal_field = fieldmodule.createFieldConstant([0, 0, 1])
     return plane_normal_field
 
 def _createRotationPointField(fieldmodule):

mapclientplugins/segmentationstep/step.py

@@ -92,7 +92,7 @@ def execute(self):
             self._model.initialize()
             self._view = SegmentationWidget(self._model)
             self._view.setSerializationLocation(os.path.join(self._location, self.getIdentifier()))
-            self._view._ui.doneButton.clicked.connect(self._doneExecution)
+            self._view.registerDoneExecution(self._doneExecution)
 
         self._setCurrentUndoRedoStack(self._model.getUndoRedoStack())
         self._setCurrentWidget(self._view)

mapclientplugins/segmentationstep/widgets/segmentationwidget.py

@@ -102,6 +102,9 @@ def _setupUi(self):
         self._ui._lineEditYOffset.setText(str(offset[1]))
         self._ui._lineEditZOffset.setText(str(offset[2]))
 
+    def registerDoneExecution(self, callback):
+        self._ui.doneButton.clicked.connect(callback)
+
     def setSerializationLocation(self, location):
         self._serialization_location = location