Merge pull request #18 from jabooth/v040

bump to menpo v0.6.x series

Author: jabooth

.gitignore

@@ -54,3 +54,5 @@ docs/_build/
 
 # IntelliJ
 *.iml
+
+.idea

conda/meta.yaml

@@ -10,12 +10,12 @@ requirements:
   run:
     - python
     - pathlib 1.0  # [py2k]
-    - enum 0.4.4 # [py2k]
-    - menpo 0.4.0|>=0.4.1,<0.5.0  # Make sure we ignore the alpha
-    - menpo3d 0.1.0|>=0.1.1,<0.2.0  # Make sure we ignore the alpha
+    - enum 0.4.4   # [py2k]
+    - menpo 0.6.*
+    - menpo3d 0.3.*
     - flask 0.10.1
     - flask-restful 0.2.12
-    - cherrypy 3.6.0
+    - cherrypy 3.8.0
     - joblib 0.8.4
     - pyyaml 3.11
 

landmarkerio/asset.py

@@ -12,10 +12,6 @@ class ImageAdapter(object):
     """
     __metaclass__ = abc.ABCMeta
 
-    @abc.abstractmethod
-    def image_info(self, asset_id):
-        pass
-
     @abc.abstractmethod
     def texture_file(self, asset_id):
         pass
@@ -55,10 +51,6 @@ def __init__(self, cache_dir):
                                                               CacheFile.image))
                                  if a.parent.parent == self.cache_dir]
 
-    def image_info(self, asset_id):
-        return reduce(safe_join,
-                      (str(self.cache_dir), asset_id, CacheFile.image))
-
     def texture_file(self, asset_id):
         return reduce(safe_join, (str(self.cache_dir),
                                   asset_id, CacheFile.texture))

landmarkerio/cache.py

@@ -1,4 +1,3 @@
-import json
 import os
 import os.path as p
 from os.path import expanduser, abspath
@@ -17,6 +16,8 @@
 from landmarkerio import CacheFile
 
 
+# identifier functions
+
 def filename_as_asset_id(fp):
     # simply return the filename as the asset_id
     return Path(fp).stem
@@ -106,19 +107,14 @@ def _cache_image_for_id(cache_dir, asset_id, img):
     # WebGL only allows textures of maximum dimension 4096
     ratio = 4096.0 / np.array(img.shape)
     if np.any(ratio < 1):
-        # the largest axis of img will now be 4096
-        img = img.rescale(ratio.min(), round='round')
-        had_to_shrink = True
-    else:
-        had_to_shrink = False
-    # 1. Save out the image metadata json
-    image_info = {'width': img.width,
-                  'height': img.height}
-    with open(image_info_path, 'wb') as f:
-        json.dump(image_info, f)
+        # the largest axis of the img could be too big for older browsers.
+        # Give a warning.
+        print('Warning: {} has shape {}. Dims larger than 4096 may have '
+              'issues rendering in older browsers.'.format(asset_id,
+                                                           img.shape))
 
     # 2. Save out the image
-    if img_path.suffix == '.jpg' and not had_to_shrink:
+    if img_path.suffix == '.jpg':
         # Original was a jpg that was suitable, save it
         shutil.copyfile(str(img_path), texture_path)
     else:

landmarkerio/server.py

@@ -241,11 +241,6 @@ def add_image_endpoints(api, adapter):
         all data to pass to landmarker.io.
 
     """
-    class Image(Resource):
-
-        def get(self, asset_id):
-            err = "{} does not have an image".format(asset_id)
-            return json_file(adapter.image_info(asset_id), err)
 
     class ImageList(Resource):
 
@@ -269,7 +264,6 @@ def get(self, asset_id):
     thumbnail_url = partial(url, Endpoints.thumbnail)
 
     api.add_resource(ImageList, image_url())
-    api.add_resource(Image, asset(image_url)())
 
     api.add_resource(Texture, asset(texture_url)())
     api.add_resource(Thumbnail, asset(thumbnail_url)())

setup.py

@@ -3,11 +3,11 @@
 import sys
 import versioneer
 
-install_requires = ['menpo>=0.4.0,<0.5',
-                    'menpo3d>=0.1.0,<0.2',
+install_requires = ['menpo>=0.6,<0.7',
+                    'menpo3d>=0.3,<0.4',
                     'Flask>=0.10.1',
                     'Flask-RESTful>=0.2.12',
-                    'CherryPy>=3.6.0',
+                    'CherryPy>=3.8.0',
                     'joblib>=0.8.4',
                     'PyYaml>=3.11']