Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Volume managment improvements #1798

Merged
merged 26 commits into from
Oct 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1bd2751
Represent volumes as TIN geometry in the database
tomka Jul 17, 2018
4792714
Volumes: Import volumes
clbarnes Jul 18, 2018
e98163d
Volume Export
Jul 18, 2018
9db0060
Included stl file format for uploading volumes
Jul 18, 2018
e666c13
Volume widget: add STL export button for volumes
Jul 18, 2018
042f34a
Some semicolons
Jul 19, 2018
9d168aa
Volumes: use extension and accept header for export
aschampion Jul 19, 2018
a9d51db
Add STL headers and export URL format
Jul 19, 2018
afb434d
Volumes: document import/export API endpoints
aschampion Jul 19, 2018
309c040
Volumes: fix STL export
aschampion Jul 19, 2018
f3642c9
Volumes: support multiple accept types in export
aschampion Jul 19, 2018
c7a6063
Volumes: error handling on volume import
Jul 19, 2018
8900fae
Volume: better STL parser
clbarnes Jul 19, 2018
bdb41dc
Volumes: Added a message on successful importing of meshes
Jul 19, 2018
3188561
Volumes: add volume ontology class
aschampion Jul 20, 2018
80506f9
Volumes: create and remove volume class instances
aschampion Jul 20, 2018
6f6b643
Tests: fix volume class instance history test
aschampion Jul 20, 2018
00f9dd7
Volume manager: represent each volume with model class
tomka Jul 20, 2018
ae6f07d
Volume manager: add annotate functionality
tomka Jul 20, 2018
4105002
Volumes: list annotations in manager
aschampion Jul 20, 2018
7a22f30
Volumes: Standardized the volume selection dropdown
Jul 20, 2018
bae8dbf
Volumes: handle error in volume list better.
Jul 20, 2018
341164d
API changelog: add volume endpoint updates
tomka Oct 17, 2018
dce6ccc
DB inegrity check: add test if all mesh faces are triangles
tomka Oct 17, 2018
3b29a4a
DB integrity check: improve triangle test
tomka Oct 17, 2018
a421f8b
DB integrity check: add consistency test for volume triangle winding
tomka Oct 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions API_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`:
Expand All @@ -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.
Expand All @@ -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`:
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion django/applications/catmaid/control/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
1 change: 0 additions & 1 deletion django/applications/catmaid/control/tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading