Merge branch 'master' of github.com:ingenuitas/SimpleSeer

SimpleSeer/models/Frame.py

@@ -11,7 +11,8 @@
 from SimpleSeer import validators as V
 import formencode as fe
 
-from .base import SimpleDoc
+
+from .base import SimpleDoc, SONScrub
 from .FrameFeature import FrameFeature
 from .Clip import Clip
 from .Result import Result, ResultEmbed
@@ -146,7 +147,7 @@ def save(self, *args, **kwargs):
                 self.layerfile.put(pygame.image.tostring(mergedlayer._mSurface, "RGBA"))
                 #TODO, make layerfile a compressed object
             #self._imgcache = ''
-
+        
         super(Frame, self).save(*args, **kwargs)
 
         #TODO, this is sloppy -- we should handle this with cascading saves

SimpleSeer/models/FrameFeature.py

@@ -26,6 +26,7 @@ def _numpy_load(son, collection):
 SONScrub.scrub_type(SimpleCV.Image)
 SONScrub.register_bsonifier(np.integer, lambda v,c: int(v))
 SONScrub.register_bsonifier(np.float, lambda v,c: float(v))
+SONScrub.register_bsonifier(np.float64, lambda v,c: float(v))
 SONScrub.register_bintype(np.ndarray, _numpy_save, _numpy_load)
 # matrices are instances of np.ndarray, no need to register them again
 # SONScrub.register_bintype(np.matrix, _numpy_save, _numpy_load)
@@ -74,6 +75,7 @@ def featurepickle(self, value):
     #this converts a SimpleCV Feature object into a FrameFeature
     #clean this up a bit
     def setFeature(self, data):
+
         self._featurecache = data
         self.x = int(data.x)
         self.y = int(data.y)
@@ -96,8 +98,10 @@ def setFeature(self, data):
         if hasattr(data, "__getstate__"):
             datadict = data.__getstate__()
         else:
-            datadict = data.__dict__
-
+            datakeys = [k for k in dir(data) if not (str(type(getattr(data,k))) == "<type 'instancemethod'>" or k.startswith("_")) ]
+            for k in datakeys:
+                datadict[k] = getattr(data, k)
+
         for k in datadict:
             if k in self.featuredata_mask or hasattr(self, k) or k[0] == "_":
                 continue