ENC: Inserted frange inside utils

tatiana
1 parent a3979279
Showing 3 changed files with 31 additions and 29 deletions Show diff stats
invesalius/data/cursor_actors.py
invesalius/data/viewer_slice.py
invesalius/utils.py
 from  math import *
-
 import vtk
-
-def frange(start, end=None, inc=None):
-    "A range function, that does accept float increments..."
-
-    if end == None:
-        end = start + 0.0
-        start = 0.0
-
-    if inc == None:
-        inc = 1.0
-
-    L = []
-    while 1:
-        next = start + len(L) * inc
-        if inc > 0 and next >= end:
-            break
-        elif inc < 0 and next <= end:
-            break
-        L.append(next)
-        
-    return L
-
+import utils
 class CursorCircle:
    # TODO: Think and try to change this class to an actor
@@ -51,8 +29,8 @@ class CursorCircle:
         """
         disk = self.disk
-        disk.SetInnerRadius(self.radius)
-        disk.SetOuterRadius(0) # filled
+        disk.SetInnerRadius(self.radius-1) # filled = self.radius
+        disk.SetOuterRadius(self.radius) # filled = 0x
         disk.SetRadialResolution(50)
         disk.SetCircumferentialResolution(50)
@@ -84,7 +62,7 @@ class CursorCircle:
         xs, ys = orientation_based_spacing[self.orientation]
         self.pixel_list = []
         radius = self.radius
-        for i in frange(yc - radius, yc + radius, ys):
+        for i in utils.frange(yc - radius, yc + radius, ys):
             # distance from the line to the circle's center
             d = yc - i
             # line size
@@ -94,7 +72,7 @@ class CursorCircle:
             # line final
             xf = line/2 + xc
             yi = i
-            for k in frange(xi,xf,xs):
+            for k in utils.frange(xi,xf,xs):
                 self.pixel_list.append((k, yi))
     def SetSize(self, radius):
@@ -269,7 +269,10 @@ class Viewer(wx.Panel):
     def SetInput(self, imagedata):
         self.imagedata = imagedata
-
+        
+        print "************************************"
+        print "spacing:", imagedata.GetSpacing()
+        print "************************************"
         ren = self.ren
         interactor = self.interactor
@@ -60,4 +60,25 @@ class TwoWaysDictionary(dict):
         """
         Find the value given a key.
         """
-        return self[key]
 \ No newline at end of file
+        return self[key]
+
+def frange(start, end=None, inc=None):
+    "A range function, that accepts float increments."
+
+    if end == None:
+        end = start + 0.0
+        start = 0.0
+
+    if inc == None:
+        inc = 1.0
+
+    L = []
+    while 1:
+        next = start + len(L) * inc
+        if inc > 0 and next >= end:
+            break
+        elif inc < 0 and next <= end:
+            break
+        L.append(next)
+        
+    return L
 \ No newline at end of file
	@@ -60,4 +60,25 @@ class TwoWaysDictionary(dict):		@@ -60,4 +60,25 @@ class TwoWaysDictionary(dict):
60	"""	60	"""
61	Find the value given a key.	61	Find the value given a key.
62	"""	62	"""
63	- return self[key]
64	\ No newline at end of file	63	\ No newline at end of file
		64	+ return self[key]
		65	+
		66	+def frange(start, end=None, inc=None):
		67	+ "A range function, that accepts float increments."
		68	+
		69	+ if end == None:
		70	+ end = start + 0.0
		71	+ start = 0.0
		72	+
		73	+ if inc == None:
		74	+ inc = 1.0
		75	+
		76	+ L = []
		77	+ while 1:
		78	+ next = start + len(L) * inc
		79	+ if inc > 0 and next >= end:
		80	+ break
		81	+ elif inc < 0 and next <= end:
		82	+ break
		83	+ L.append(next)
		84	+
		85	+ return L
65	\ No newline at end of file	86	\ No newline at end of file