Changeset 1063

Timestamp:

11/18/08 16:37:46 (5 years ago)

Author:

fma

Message:

Code cleanup

File:

• trunk/papywizard/model/scan.py (modified) (5 diffs)

trunk/papywizard/model/scan.py

@@ -63 +63 @@
 
     Scan is the base object for shooting object.
-
-    >>> scan = Scan()
-    >>> for yaw, pitch in scan.iterPositions():
-    ...     print yaw, pitch
     """
     def __init__(self, model):
@@ -92 +88 @@
     totalNbPicts = property(__getTotalNbPicts)
 
+    # Helpers
+    def _iterPositions(self):
+        """ Real iteration over all shooting positions.
+        """
+        self._index = 0
+        while True:
+            try:
+                yield self._index + 1, self._positions[self._index]
+            except IndexError:
+                raise StopIteration
+            self._index += 1
+
+
     # Interface
     def iterPositions(self):
         """ Iterate over all (yaw, pitch) positions.
+
+        We first generate all positions, and then iterate over that list.
+        This way, it is possible to change the current index, to change
+        the sequence.
         """
         raise NotImplementedError
@@ -248 +261 @@
     #Interface
     def iterPositions(self):
-        """ Iterate over all (yaw, pitch) positions.
-
-        We first generate all positions, and then iterate over that list.
-        This way, it is possible to change the current index, to change
-        the sequence.
-        """
 
         # Generate all positions
@@ -348 +355 @@
 
         # Iterate over positions
-        self._index = 0
-        while True:
-            try:
-                yield self._index + 1, self._positions[self._index]
-            except IndexError:
-                raise StopIteration
-            self._index += 1
+        return self._iterPositions()
 
 
@@ -387 +388 @@
     # Interface
     def iterPositions(self):
+
+        # Generate positions
+        self._positions = []
         preset = self.__presets.getByName(self.name)
         Logger().debug("PresetScan.__init__(): preset=%s" % preset)
-        positions = preset.getPositions()
-        for yaw, pitch in positions:
-            yield yaw, pitch
-        raise StopIteration
+        self._positions = preset.getPositions()
+
+        # Iterate over positions
+        return self._iterPositions()