Changeset 9026 for src/django_gheat/gheat/base.py

Timestamp:

Apr 6, 2011, 4:23:50 PM (14 years ago)

Author:

dennisw

Message:

django_gheat - werkt met database, transprancy gefixed

File:

• src/django_gheat/gheat/base.py (modified) (5 diffs)

src/django_gheat/gheat/base.py

@@ -8 +8 @@
 import gheat
 import gheat.opacity
-from gheat.models import Point
+from gheat.models import Accespoint, Gebruiker, Meting
 from gheat import gheatsettings as settings
 from gheat import gmerc
@@ -164 +164 @@
         SELECT count(uid) FROM points
         """
-        numpoints = Point.objects.num_points(self)
+        numpoints = Meting.objects.num_points(self)
         return numpoints == 0
 
@@ -178 +178 @@
    
         timestamp = os.stat(self.fspath)[stat.ST_MTIME]
-        modtime = datetime.datetime.fromtimestamp(timestamp)
-
-        numpoints = Point.objects.num_points(self, modtime)
+        datum = datetime.datetime.fromtimestamp(timestamp)
+
+        numpoints = Meting.objects.num_points(self, datum)
 
         return numpoints > 0
@@ -194 +194 @@
         # to be included on this tile, relative to the top-left of the tile.
 
-        _points = Point.objects.points_inside(self)
+        _points = Meting.objects.points_inside(self)
    
         def points():
@@ -204 +204 @@
                 x = x - self.x1 # account for tile offset relative to
                 y = y - self.y1 #  overall map
-                point_density = point.density
-                while point_density > 0:
+                point_signaal = point.signaal
+                while point_signaal > 0:
                     result.append((x-self.pad,y-self.pad))
-                    point_density = point_density - 1
+                    point_signaal = point_signaal - 1
             return result