Ticket #908: issue_908.patch

mediagoblin/media_types/stl/migrations.py

@@ -14 +14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from sqlalchemy import MetaData, Table, Column, Float
+from mediagoblin.db.migration_tools import RegisterMigration
+
 MIGRATIONS = {}
+
+@RegisterMigration(1, MIGRATIONS)
+def add_volume_column(db_conn):
+    metadata = MetaData(bind=db_conn.bind)
+
+    stl_data = Table('stl__mediadata', metadata, autoload=True,
+            autoload_with=db_conn.bind)
+
+    col = Column('volume', Float, nullable=True)
+    col.create(stl_data)
+    db_conn.commit()

mediagoblin/media_types/stl/model_loader.py

@@ -1 +1 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012, 2014 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16 +16 @@
 
 
 import struct
+import logging
 
+_use_admesh = True
+try:
+    import admesh
+except:
+    _use_admesh = False
+
+_log = logging.getLogger(__name__)
 
 class ThreeDeeParseError(Exception):
     pass
 
 
-class ThreeDee():
+class ThreeDee(object):
     """
     3D model parser base class.  Derrived classes are used for basic
     analysis of 3D models, and are not intended to be used for 3D
@@ -37 +45 @@
         self.width = 0  # x axis
         self.depth = 0  # y axis
         self.height = 0 # z axis
+        self.volume = None
 
         self.load(fileob)
         if not len(self.verts):
@@ -83 +92 @@
             line = line.strip()
             if line[0] == "v":
                 self.verts.append(self.__vector(line))
-            
 
-class BinaryStlModel(ThreeDee):
+class StlModel(ObjModel):
+    """
+    General parser for STL models. This class provides a wrapper
+    method to use admesh to calculate STL file volume (admesh can't
+    parse OBJ files)
+    """
+
+    def __volume(self, fileob):
+        if _use_admesh:
+            stl_file = admesh.stl_file()
+            admesh.stl_open(stl_file, str(fileob.name))
+            admesh.stl_calculate_volume(stl_file)
+            self.volume = stl_file.stats.volume
+
+    def __init__(self, fileob):
+        super(StlModel, self).__init__(fileob)
+        if _use_admesh:
+            _log.info("Using admesh to calculate volume")
+            self.__volume(fileob)
+        else:
+            _log.warn("Admesh not installed. Bypassing volume calculation. ")
+
+    def load(self, fileob):
+        super(ObjModel,self).load(fileob)
+
+class BinaryStlModel(StlModel):
     """
     Parser for ascii-encoded stl files.  File format reference:
     http://en.wikipedia.org/wiki/STL_%28file_format%29#Binary_STL
@@ -117 +150 @@
             # HACK Ascii formatted stls are similar enough to obj
             # files that we can just use the same parser for both.
             # Isn't that something?
-            return ObjModel(fileob)
+            return StlModel(fileob)
         except ThreeDeeParseError:
             pass
         except ValueError:

mediagoblin/media_types/stl/models.py

@@ -42 +42 @@
     width = Column(Float)
     height = Column(Float)
     depth = Column(Float)
+    volume = Column(Float)
 
     file_type = Column(String)
 

mediagoblin/media_types/stl/processing.py

@@ -253 +253 @@
             "width": self.model.width,
             "height": self.model.height,
             "depth": self.model.depth,
+            "volume": self.model.volume,
             "file_type": self.ext,
             }
         self.entry.media_data_init(**dimensions)

mediagoblin/templates/mediagoblin/media_displays/stl.html

@@ -146 +146 @@
 <p>{{ media.media_data.file_type }}</p>
 <h3>{% trans %}Object Height{% endtrans %}</h3>
 <p>~{{ media.media_data.height|int }} mm</p>
+{% if media.media_data.volume %}
+<h3>{% trans %}Object Volume{% endtrans %}</h3>
+<p>~{{ media.media_data.volume|int }} mm³</p>
+{% endif %}
 {% endblock %}