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

Bravenewworld skeletons #1957

Merged
merged 215 commits into from
Nov 2, 2017
Merged

Bravenewworld skeletons #1957

merged 215 commits into from
Nov 2, 2017

Conversation

jfrohnhofen
Copy link
Contributor

@jfrohnhofen jfrohnhofen commented Aug 8, 2017

Mailable description of changes:

  • storing skeleton tracings in a different backend

Steps to test:

  • run testing protocols with lab ;)

List of frontend changes:

  • Update actions format changed to this:
	[
	   {
	      "version":7,
	      "timestamp":1505910023150,
	      "actions":[
	         {
	            "name":"createNode",
	            "value":{ ... }
	         },
	         {
	            "name":"createEdge",
	            "value":{ ... }
	         },
	      ],
	      "stats":{
	         "treeCount":1,
	         "nodeCount":6,
	         "edgeCount":5,
	         "branchPointCount":0
	      }
	   },
	   {
	      "version":8,
	      "timestamp":1505910023384,
	      "actions":[
	         {
	            "name":"updateTracing",
	            "value":{ ... }
	         }
	      ],
	      "stats":null
	   }
	]
  • This is an array of batched update actions. One batch is the result of one action in the webknossos frontend (e.g.: splitting a tree by removing a node). Each batch has a version number, a timestamp, a list of update actions and optionally a stats object that contains node/edge/.. count statistics.

  • jsRoutes were removed

  • Annotation, tracing and dataset are now fetched separately (the annotation is the meta data for a tracing, the tracing are the trees, comments and so on)

  • there is now a distinction between the annotationId and the tracingId

  • several json properties were renamed on the server (look at the server flow types in model.js and api_flow_types.js)

  • the view mode (look at dataset only) was refactored to no longer need an annotation and tracing

  • the strange form-construct that was used in the advanced dataset list view to start skeleton/volume tracings was replaced with simple links

  • routes that start with /data/ (and therefore address the datastore) need a token parameter now (use the doWithToken wrapper method)

  • voxels that were labeled during a volume tracing are now pushed to the server using the standard save queue instead of the dedicated push queue

Issues:


  • Ready for review

fm3 and others added 30 commits July 11, 2017 13:37
…webknossos into brave_new_world_skeletons

* 'brave_new_world_skeletons' of github.com:scalableminds/webknossos:
  Run dev servers on *.webknossos.xyz (#1941)
  Adds scriptId to bulk task creation (#1935)
@daniel-wer
Copy link
Member

@hotzenklotz Very thorough testing indeed, thanks a lot! I applied your PR feedback and answered your questions :)

fm3 and others added 9 commits October 24, 2017 14:11
* master:
  pretty me
  bump libs version number
  fix token access; bump braingames version (#2085)
  removed unused backbone model #2009
  move dataset uploading into Rest API module #2009
  enabled file preview hint before upload new dataset #2009
  reactified dataset upload view #2209
  Changed schema after tests #2055
  Further implementation of PR review advices #2055
  Implemented first part of review comments #2055
  prepared schemas for PR #1929
  changed DataToken to UUID and created a List of things ToDo to make the db valid #1929
  prettified files and added one error #1929
  even better schemas and added list of errors #1929
  Fixed schemas and added a script to test validation #1929
  Added checks for arrays #1929
  refined schemas with regex almost finished #1929
  started on sub-document validation
  Fixed dataStores.schema.js
  renamed files and made files prettier #1929
@jfrohnhofen jfrohnhofen merged commit c6b1abd into master Nov 2, 2017
@jfrohnhofen jfrohnhofen deleted the bravenewworldSkeletons branch November 3, 2017 14:35
hotzenklotz added a commit that referenced this pull request Nov 3, 2017
…ct-task-create

* 'master' of github.com:scalableminds/webknossos: (167 commits)
  Enable interpolation setting in volume mode (#2089)
  allow admins to administrate datasets
  fix compilation
  update libs
  remove jsRoutes from tests
  apply PR feedback (#1957)
  removed github conf
  fixed lint
  make flow happy
  fix merge conflicts in frontend
  Changed schema after tests #2055
  merge master. TODO: fix flow errors, test volume fallback layer
  remove obsolete version field from annotation (only tracings are versioned now)
  Further implementation of PR review advices #2055
  Implemented first part of review comments #2055
  remove obsolete todo
  log time for the user who sent the updates, not for the annotation owner
  use new libs version
  update libs version
  disable e2e tests
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Group skeleton updateActions for proper versions
5 participants