Merge pull request #1798 from catmaid/features/volume-hackathon

Volume managment improvements

API_CHANGELOG.md

@@ -28,6 +28,12 @@ included in this changelog.
 - `GET /{project_id}/labels/detail`:
   Returns a list of of label objects, each with a name field and an ID field.
 
+- `POST /{project_id}/volumes/import`:
+  Import volumes as STL files.
+
+- `GET /{project_id}/volumes/{volume_id}/export.{extension}`:
+  Export a particular volume. Currentl only exports AS STL are supported.
+
 ### Modifications
 
 - `POST /{project_id}/skeletons/node-label`:
@@ -54,6 +60,13 @@ included in this changelog.
   marked as soma in the SWC export. The first matching condition in this order
   wins.
 
+- `GET /{project_id}/volumes/`:
+  The return format changed. Instead of a list of volume objects an object with
+  a 'columns' field and a 'data' field are returned. The data fields contains a
+  list of lists, with each inner list being a volume. The entries are described
+  by the 'columns' field. Along with the already returned fields, annotations
+  are now retuned as well.
+
 ### Deprecations
 
 None.
@@ -75,6 +88,9 @@ None.
   Accepts the same parameters as the GET variant, but allows for larger
   skeleton_ids list.
 
+- `GET /{project_id}/volumes/entities`:
+  Return a mapping of volume IDs to their respective class instance ID.
+
 ### Modifications
 
 - `GET /{project_id}/skeletons/in-bounding-box`:

CHANGELOG.md

@@ -142,6 +142,11 @@ Miscellaneous:
 - Admin: a user import view is now available to import users from other CATMAID
   instances. It requires superuser permissions on the remote instance.
 
+- DB integrity check management command: volumes are now checked to make sure
+  all faces are triangles. The --tracing [true|false] and --volumes [true|false]
+  command line parameters now allow to explicitly test only some parts of the
+  database. By default all is tested.
+
 
 ### Bug fixes
 

django/applications/catmaid/control/project.py

@@ -23,7 +23,8 @@
     'annotation': "An arbitrary annotation",
     'stack_property': 'A property which a stack has',
     'landmark': "A particular type of location",
-    "landmarkgroup": "A type of collection that groups landmarks"
+    "landmarkgroup": "A type of collection that groups landmarks",
+    'volume': 'A region of space'
 }
 
 # All relations needed by the tracing system alongside their
@@ -34,6 +35,7 @@
     'annotated_with': "Something is annotated by something else.",
     'has_property': 'A thing which has an arbitrary property',
     'close_to': 'Something is spatially in the neighborhood of something else',
+    'model_of': "Marks something as a model of something else."
 }
 
 # All client datastores needed by the tracing system along their descriptions.

django/applications/catmaid/control/tracing.py

@@ -28,7 +28,6 @@
 needed_relations = {
     'labeled_as': "Something is labeled by sth. else.",
     'element_of': "A generic element-of relationship",
-    'model_of': "Marks something as a model of something else.",
     'presynaptic_to': "Something is presynaptic to something else.",
     'postsynaptic_to': "Something is postsynaptic to something else.",
     'abutting': "Two things abut against each other",